ruby-grafana-reporter 0.4.1 → 0.4.2

data/lib/grafana_reporter/panel_image_query.rb

@@ -5,10 +5,6 @@ module GrafanaReporter
   class PanelImageQuery < AbstractQuery
     # Sets the proper render variables.
     def pre_process
-      @from = translate_date(@from, @variables['grafana_report_timestamp'], false, @variables['from_timezone'] ||
-                             @variables['grafana_default_from_timezone'])
-      @to = translate_date(@to, @variables['grafana_report_timestamp'], true, @variables['to_timezone'] ||
-                           @variables['grafana_default_to_timezone'])
       # TODO: ensure that in case of timezones are specified, that they are also forwarded to the image renderer
       # rename "render-" variables
       @variables = @variables.each_with_object({}) { |(k, v), h| h[k.gsub(/^render-/, '')] = v }
@@ -18,7 +14,7 @@ module GrafanaReporter
     # Returns the body of the http query, which contains the raw image.
     def post_process
       @result = @result[:content].first
-      raise ImageCouldNotBeRenderedError, @panel if @result.include?('<html')
+      raise ::Grafana::ImageCouldNotBeRenderedError, @panel if @result.include?('<html')
     end
 
     # @see AbstractQuery#raw_query

data/lib/grafana_reporter/query_value_query.rb

@@ -3,15 +3,10 @@
 module GrafanaReporter
   # This class provides a general query implementation for any kind of single value and table queries.
   class QueryValueQuery < AbstractQuery
-    # Translates the from and to times.
     # @see Grafana::AbstractQuery#pre_process
     def pre_process
       @datasource = @panel.datasource if @panel
 
-      @from = translate_date(@from, @variables['grafana_report_timestamp'], false, @variables['from_timezone'] ||
-                             @variables['grafana_default_from_timezone'])
-      @to = translate_date(@to, @variables['grafana_report_timestamp'], true, @variables['to_timezone'] ||
-                           @variables['grafana_default_to_timezone'])
       @variables['result_type'] ||= Variable.new('')
     end
 
@@ -25,7 +20,7 @@ module GrafanaReporter
 
       case @variables['result_type'].raw_value
       when /(?:panel_table|sql_table)/
-        result_to_table
+        @result = format_table_output(@result, row_divider: @variables['row_divider'], column_divider: @variables['column_divider'])
 
       when /(?:panel_value|sql_value)/
         tmp = @result[:content] || []
@@ -56,19 +51,6 @@ module GrafanaReporter
 
     private
 
-    def result_to_table
-      row_div = '| '
-      row_div = @variables['row_divider'].raw_value if @variables['row_divider'].is_a?(Grafana::Variable)
-      col_div = ' | '
-      col_div = @variables['column_divider'].raw_value if @variables['column_divider'].is_a?(Grafana::Variable)
-
-      @result = @result[:content].map do |row|
-        row_div + row.map do |item|
-          col_div == ' | ' ? item.to_s.gsub('|', '\\|') : item.to_s
-        end.join(col_div)
-      end
-    end
-
     def modify_results
       @result = format_columns(@result, @variables['format'])
       @result = replace_values(@result, @variables.select { |k, _v| k =~ /^replace_values_\d+/ })

data/lib/ruby_grafana_reporter.rb

@@ -18,18 +18,6 @@ require 'asciidoctor-pdf'
 require 'zip'
 require_relative 'VERSION'
 
-# TODO: show error in document, if grafana could not be accessed
-# TODO: show backtrace in extension error rescues
-# TODO: improve ERB calls
-# TODO: add test case for proper image generation
-# TODO: allow to choose report-class during execution, not mandatory by config file
-# TODO: add docu for ERB reports
-# TODO: add docu for custom plugins
-# TODO: add docu for webhook
-
-# TODO: enable as asciidoctor extension
-# TODO: build ADOC template as a result with resolved grafana content for further editing
-
 folders = [
   %w[grafana],
   %w[grafana_reporter logger],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-grafana-reporter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Christian Kohlmeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -121,6 +121,7 @@ files:
 - "./lib/grafana/grafana_property_datasource.rb"
 - "./lib/grafana/graphite_datasource.rb"
 - "./lib/grafana/image_rendering_datasource.rb"
+- "./lib/grafana/influxdb_datasource.rb"
 - "./lib/grafana/panel.rb"
 - "./lib/grafana/prometheus_datasource.rb"
 - "./lib/grafana/sql_datasource.rb"
@@ -152,6 +153,7 @@ files:
 - "./lib/grafana_reporter/console_configuration_wizard.rb"
 - "./lib/grafana_reporter/demo_report_wizard.rb"
 - "./lib/grafana_reporter/erb/report.rb"
+- "./lib/grafana_reporter/erb/report_jail.rb"
 - "./lib/grafana_reporter/errors.rb"
 - "./lib/grafana_reporter/help.rb"
 - "./lib/grafana_reporter/logger/two_way_delegate_logger.rb"