sql-jarvis 2.1.5 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd81a249e949ad7c6fe925701c4221f5d7466aa1a3503b2f3444ceda82282e2f
-  data.tar.gz: aa56786392647652e110c5405f5aa67660f29fa822da7c7f09df88fdeacad836
+  metadata.gz: cfb54328ee2d275f1aab831bdc7d52fddff2b7f52231774a1723aa25fcac8a82
+  data.tar.gz: a7dd3acceb9459afcaaf946336fb23c4299e5b341aad2e169ba0cc074039e38c
 SHA512:
-  metadata.gz: d4c04a6cda8473b157f6605bd2187ef52383e8d2cfb9661f657095bbc22e9653c7570302b756a932d165970f11b466c811244560ccc2eb5355da5dc01606dcff
-  data.tar.gz: 66d479f3aada4eae9e7656e030b805aefb9ed14fb2b04445793899c084a381e39917dcad6ac725ffb012acd1bdaccc1c8c4ea6a418924396224a0dc26b8ce83f
+  metadata.gz: 602a0748fcb3f50223cb5450d10dce80e03fd10f3e1d52451880b5fa3040f24f7114fa3b5debce7ee76cf47f6f9f6f10ec24e4257b7f098adb534ecc0d004e19
+  data.tar.gz: 649a9f8b5cedbcde958436a7694a4ede682dab551416ed7646456787d4122af780250ac465c9d31a0f8d3253c63bc454948e47a3e7d352d686d46ff9707e8ae7

data/app/controllers/blazer/checks_controller.rb

@@ -1,6 +1,8 @@
 module Blazer
   class ChecksController < BaseController
     before_action :set_check, only: [:edit, :update, :destroy, :run]
+    before_action :set_new_check, only: [:new]
+    before_action :set_accessible, only: [:new, :edit]
 
     def index
       state_order = [nil, "disabled", "error", "timed out", "failing", "passing"]
@@ -9,7 +11,6 @@ module Blazer
     end
 
     def new
-      @check = Blazer::Check.new(query_id: params[:query_id])
     end
 
     def create
@@ -46,11 +47,31 @@ module Blazer
     private
 
       def check_params
-        params.require(:check).permit(:query_id, :emails, :slack_channels, :invert, :check_type, :schedule)
+        params.require(:check).permit(:query_id, :emails, :slack_channels, :invert, :check_type, :schedule, slack_members: [])
       end
 
       def set_check
         @check = Blazer::Check.find(params[:id])
       end
+
+      def set_new_check
+        @check = Blazer::Check.new(query_id: params[:query_id])
+      end
+
+      def set_accessible
+        existed_members = @check&.slack_members.presence || []
+        @slack_mentions ||= get_slack_mentions + existed_members.each_with_object([]) { |m, list| list << [m, m] if m.present? }
+      ensure
+        @slack_mentions ||= []
+      end
+
+      def get_slack_mentions
+        return [] unless Blazer.settings.key?('slack_mentions')
+        Blazer::RunStatement.new.perform(Blazer.data_sources[@check.query&.data_source], Blazer.settings['slack_mentions'], {}).rows.map do |row|
+          [row.last, "[#{row.first}] #{row.second} - ##{row.last}"]
+        end
+      rescue
+        []
+      end
   end
 end

data/app/controllers/blazer/queries_controller.rb

@@ -362,8 +362,16 @@ module Blazer
 
     def get_assignees
       return [] unless Blazer.settings.key?('assignees')
+
       Blazer::RunStatement.new.perform(@data_source, Blazer.settings['assignees'], {}).rows.map do |row|
-        [row.first, row.last.to_s.titleize]
+        case row.size
+        when 2
+          [row.first, row.last.to_s.titleize]
+        when 3
+          [row.first, "#{row.second.to_s.titleize} - #{row.last}"]
+        else
+          [row.first, row.first]
+        end
       end
     rescue
       []

data/app/mailers/blazer/slack_notifier.rb

@@ -28,20 +28,38 @@ module Blazer
     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
+      all_mentions = []
+      attachments = checks.map do |check|
+        mentions = check.slack_mention_tags
+        all_mentions << mentions
+        result = Blazer.data_sources[check.query.data_source].run_statement(check.query.statement)
+        {
+          mrkdwn_in: %w[title text],
+          title: "<#{query_url(check.query_id)}|#{escape(check.query.name)}> #{escape(check.state)} #{mentions.join(' ')}",
+          text: "#{Blazer.slack_preview_items_number} first rows `#{result.columns.first}: #{result.rows.first(Blazer.slack_preview_items_number).map(&:first).join(', ')}`",
+          color: 'warning'
+        }
+      end
 
       payload = {
         channel: channel,
-        attachments: [
+        blocks: [
           {
-            title: escape("#{pluralize(checks.size, "Check")} Failing"),
-            text: text.join("\n"),
-            color: "warning"
+            type: 'header',
+            text: {
+              type: 'plain_text',
+              text: escape("#{pluralize(checks.size, 'Check')} Failing")
+            }
+          },
+          {
+            type: 'section',
+            text: {
+              type: 'mrkdwn',
+              text: "Hey #{all_mentions.uniq.join(' ')}, there are some failing checks:"
+            }
           }
-        ]
+        ],
+        attachments: attachments
       }
 
       post(Blazer.slack_webhook_url, payload)

data/app/models/blazer/check.rb

@@ -1,5 +1,7 @@
 module Blazer
   class Check < Record
+    serialize :slack_members, Array
+
     belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
     belongs_to :query
 
@@ -22,6 +24,26 @@ module Blazer
       end
     end
 
+    def slack_mention_tags
+      tags = []
+      slack_members.each do |code|
+        case code
+        when /^U/
+          tags << "<@#{code.strip}>"
+        when /^S/
+          tags << "<!subteam^#{code.strip}>"
+        when 'here'
+          tags << '<!here|here>'
+        when 'channel'
+          tags << '<!channel>'
+        when 'everyone'
+          tags << '<!everyone>'
+        end
+      end
+
+      tags.uniq
+    end
+
     def update_state(result)
       check_type =
         if respond_to?(:check_type)

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

@@ -42,6 +42,10 @@
     .form-group
       = f.label :slack_channels
       = f.text_field :slack_channels, placeholder: "Optional, comma separated", class: "form-control"
+    .form-group
+      = f.label :slack_members
+      = f.collection_select :slack_members, @slack_mentions, :first, :last, {}, { placeholder: "User, Users group Slack ID", class: "form-control", multiple: true }
+    %p.text-muted Slack members: can select or enter new user/user_group Slack ID. It also supports special mentions: channel, everyone, here.
   %p.text-muted
     Emails #{Blazer.slack? ? "and Slack notifications " : nil}are sent when a check starts failing, and when it starts passing again.
   %p
@@ -49,3 +53,9 @@
       = link_to "Delete", check_path(@check), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger"
     = f.submit "Save", class: "btn btn-success"
     = link_to "Back", :back, class: "btn btn-link"
+:javascript
+  $(document).ready(function() {
+    $('#check_slack_members').select2({
+      tags: true,
+    });
+  });

data/lib/blazer/engine.rb

@@ -41,6 +41,7 @@ module Blazer
       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"]
+      Blazer.slack_preview_items_number = Blazer.settings["slack_preview_items_number"] || 25
     end
   end
 end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = '2.1.5'
+  VERSION = '2.1.7'
 end

data/lib/blazer.rb

@@ -61,6 +61,8 @@ module Blazer
     attr_accessor :override_csp
     attr_accessor :slack_webhook_url
     attr_accessor :query_creatable
+    attr_accessor :slack_preview_items_number
+    attr_accessor :slack_mentions
   end
 
   self.audit = true

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

@@ -61,8 +61,11 @@ audit: true
 # mapbox_access_token: <%= ENV["MAPBOX_ACCESS_TOKEN"] %>
 
 # assignees: 'SELECT id, name FROM users ORDER BY id ASC'
+# slack_mentions: 'SELECT 'User' as type, name as title, ext_code as code FROM users ORDER BY id ASC'
 # teams: 'SELECT id, name FROM teams'
 
+slack_preview_items_number: 25
+
 check_schedules:
   - "1 day"
   - "1 hour"

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.7
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: andrew@chartkick.com
 executables: []
 extensions: []
@@ -270,7 +270,7 @@ homepage: https://github.com/ThanhKhoaIT/blazer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -285,8 +285,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Fork from ankane! Explore your data with SQL. Easily create charts and dashboards,
   and share them with your team.