ruby-grafana-reporter 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e3324f4e9d6fa3a47963a73ae4371122f603039284d0b453ac2f62881c5b93
-  data.tar.gz: 535a8f6f2763a5689472a423090504bbd5eed6b5610a557c7d9452999694f52c
+  metadata.gz: e06395c66d098c01d5248872f7aac2bc8dd36c4f9c6f02774ffe022fd0cafc9f
+  data.tar.gz: 6ad05dfac340497fb0be61b14b6420a348b05dbd71b14e17b55553573cfcf3b8
 SHA512:
-  metadata.gz: e77dd83050e40196334058503c902ac6fc9285bf13a4ac8398ec9ffcf724160b30091ac6994cbff48326b4512499ccc7f0358f291e9af417a3903b8cfb2ac32d
-  data.tar.gz: 2c46bc4ccdd59cd49588e292e1882662b40cde32a50898e14e33eb1f50fffdd5334c86c837bb3e249155002cd80c78af51bfd9897e176654eeece1ebd2d92084
+  metadata.gz: 769a0c9258678b32100b21e38782ca668467ad2e016e63e3bc293d96311bb06d74b0b2a71f4033a576c71c94185e072ad37ac55d8d4cdc13a516a92f6c359895
+  data.tar.gz: 53a645d2db1eac77ed0e6977932b2947eb41efccf33f49f77db6c7ea4254ebd2f0c299fb1211546356734b744ca6359f36f392ae3afcf4243c835da3c7671bfa

data/lib/VERSION.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 # Version information
-GRAFANA_REPORTER_VERSION = [0, 6, 2].freeze
+GRAFANA_REPORTER_VERSION = [0, 6, 3].freeze
 # Release date
-GRAFANA_REPORTER_RELEASE_DATE = '2022-09-14'
+GRAFANA_REPORTER_RELEASE_DATE = '2023-01-08'

data/lib/grafana/grafana.rb

@@ -86,15 +86,8 @@ module Grafana
     # @param datasource_uid [String] unique id of the searched datasource
     # @return [Datasource] Datasource for the specified datasource unique id
     def datasource_by_uid(datasource_uid)
-      datasource = @datasources.select do |ds_name, ds|
-        if (ds.nil?)
-          # print debug info for https://github.com/divinity666/ruby-grafana-reporter/issues/29
-          @logger.warn("Datasource with name #{ds_name} is nil, which should never happen. Check logs for details.")
-          false
-        else
-          ds.uid == datasource_uid
-        end
-      end.values.first
+      clean_nil_datasources
+      datasource = @datasources.select { |ds_name, ds| ds.uid == datasource_uid }.values.first
       raise DatasourceDoesNotExistError.new('uid', datasource_uid) unless datasource
 
       datasource
@@ -105,7 +98,8 @@ module Grafana
     # @param datasource_id [Integer] id of the searched datasource
     # @return [Datasource] Datasource for the specified datasource id
     def datasource_by_id(datasource_id)
-      datasource = @datasources.select { |_name, ds| ds.id == datasource_id.to_i }.values.first
+      clean_nil_datasources
+      datasource = @datasources.select { |name, ds| ds.id == datasource_id.to_i }.values.first
       raise DatasourceDoesNotExistError.new('id', datasource_id) unless datasource
 
       datasource
@@ -171,7 +165,18 @@ module Grafana
           @datasources.delete(ds_name)
         end
       end
-      @datasources['default'] = @datasources[json['defaultDatasource']]
+
+      @datasources['default'] = @datasources[json['defaultDatasource']] if not @datasources[json['defaultDatasource']].nil?
+    end
+
+    def clean_nil_datasources
+      @datasources.delete_if do |name, ds|
+        if ds.nil?
+          # print debug info for https://github.com/divinity666/ruby-grafana-reporter/issues/29
+          @logger.warn("Datasource with name #{name} is nil, which should never happen. Check logs for details.")
+        end
+        ds.nil?
+      end
     end
   end
 end

data/lib/grafana_reporter/application/webservice.rb

@@ -91,8 +91,8 @@ module GrafanaReporter
             @logger.error(e.message)
             socket.write http_response(400, 'Bad Request', e.message)
           rescue StandardError => e
-            @logger.fatal(e.message)
-            socket.write http_response(400, 'Bad Request', e.message)
+            @logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+            socket.write http_response(400, 'Bad Request', "#{e.message}\n#{e.backtrace.join("\n")}")
           ensure
             socket.close
           end

data/lib/grafana_reporter/asciidoctor/alerts_table_include_processor.rb

@@ -76,8 +76,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           reader.unshift_line "|#{e.message}"
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          reader.unshift_line "|#{e.message}"
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          reader.unshift_line "|#{e.message}\n#{e.backtrace.join("\n")}"
         end
 
         reader

data/lib/grafana_reporter/asciidoctor/annotations_table_include_processor.rb

@@ -75,8 +75,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           reader.unshift_line "|#{e.message}"
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          reader.unshift_line "|#{e.message}"
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          reader.unshift_line "|#{e.message}\n#{e.backtrace.join("\n")}"
         end
 
         reader

data/lib/grafana_reporter/asciidoctor/panel_image_block_macro.rb

@@ -56,8 +56,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           return create_paragraph(parent, e.message, attrs)
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          return create_paragraph(parent, e.message, attrs)
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          return create_paragraph(parent, "#{e.message}\n#{e.backtrace.join("\n")}", attrs)
         end
 
         attrs['target'] = image_path

data/lib/grafana_reporter/asciidoctor/panel_image_inline_macro.rb

@@ -58,8 +58,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           return create_inline(parent, :quoted, e.message)
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          return create_inline(parent, :quoted, e.message)
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          return create_inline(parent, :quoted, "#{e.message}\n#{e.backtrace.join("\n")}")
         end
 
         create_inline(parent, :image, nil, { target: image_path, attributes: attrs })

data/lib/grafana_reporter/asciidoctor/panel_property_inline_macro.rb

@@ -50,8 +50,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           return create_inline(parent, :quoted, e.message)
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          return create_inline(parent, :quoted, e.message)
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          return create_inline(parent, :quoted, "#{e.message}\n#{e.backtrace.join("\n")}")
         end
 
         # translate linebreaks to asciidoctor syntax

data/lib/grafana_reporter/asciidoctor/panel_query_table_include_processor.rb

@@ -70,8 +70,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           reader.unshift_line "|#{e.message}"
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          reader.unshift_line "|#{e.message}"
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          reader.unshift_line "|#{e.message}\n#{e.backtrace.join("\n")}"
         end
 
         reader

data/lib/grafana_reporter/asciidoctor/panel_query_value_inline_macro.rb

@@ -66,8 +66,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           create_inline(parent, :quoted, e.message)
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          create_inline(parent, :quoted, e.message)
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          create_inline(parent, :quoted, "#{e.message}\n#{e.backtrace.join("\n")}")
         end
       end
 

data/lib/grafana_reporter/asciidoctor/sql_table_include_processor.rb

@@ -64,8 +64,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           reader.unshift_line "|#{e.message}"
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          reader.unshift_line "|#{e.message}"
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          reader.unshift_line "|#{e.message}\n#{e.backtrace.join("\n")}"
         end
 
         reader

data/lib/grafana_reporter/asciidoctor/sql_value_inline_macro.rb

@@ -71,8 +71,8 @@ module GrafanaReporter
           @report.logger.error(e.message)
           create_inline(parent, :quoted, e.message)
         rescue StandardError => e
-          @report.logger.fatal(e.message)
-          create_inline(parent, :quoted, e.message)
+          @report.logger.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
+          create_inline(parent, :quoted, "#{e.message}\n#{e.backtrace.join("\n")}")
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-grafana-reporter
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Christian Kohlmeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor