ruby-grafana-reporter 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00837acead340b75df1bc4dcdf93c05c8014c1317aae288191b592b77a660a7a'
-  data.tar.gz: 2e072de19e45e7fe5f167f37ec4a88be2a482bf7843df96f059a9489e48760b6
+  metadata.gz: e06395c66d098c01d5248872f7aac2bc8dd36c4f9c6f02774ffe022fd0cafc9f
+  data.tar.gz: 6ad05dfac340497fb0be61b14b6420a348b05dbd71b14e17b55553573cfcf3b8
 SHA512:
-  metadata.gz: eec08117ef1a83e7c0a016e80cce31c67fcf552253b63141a440951fa94f1168531b31131ae5cc79e50ac14bf4161a867b717f1c2bfb77ed6d0edac985b7cc38
-  data.tar.gz: fe05d5a7baeb91411fb5942602cd66a66ae8dfcc65eedb7cf421617ffa6c827f5d2a11306dc33ffae9370033a35c10883c17c11f25d8a431bebaf7ae476af4ef
+  metadata.gz: 769a0c9258678b32100b21e38782ca668467ad2e016e63e3bc293d96311bb06d74b0b2a71f4033a576c71c94185e072ad37ac55d8d4cdc13a516a92f6c359895
+  data.tar.gz: 53a645d2db1eac77ed0e6977932b2947eb41efccf33f49f77db6c7ea4254ebd2f0c299fb1211546356734b744ca6359f36f392ae3afcf4243c835da3c7671bfa

data/README.md

@@ -1,5 +1,5 @@
 [![MIT License](https://img.shields.io/github/license/divinity666/ruby-grafana-reporter.svg?style=flat-square)](https://github.com/divinity666/ruby-grafana-reporter/blob/master/LICENSE)
-[![Build Status](https://travis-ci.com/divinity666/ruby-grafana-reporter.svg?branch=master)](https://travis-ci.com/github/divinity666/ruby-grafana-reporter?branch=master)
+[![Build Status](https://ci.appveyor.com/api/projects/status/5ac434885onmqpm4/branch/master?svg=true)](https://ci.appveyor.com/project/divinity666/ruby-grafana-reporter/branch/master)
 [![Coverage Status](https://coveralls.io/repos/github/divinity666/ruby-grafana-reporter/badge.svg?branch=master)](https://coveralls.io/github/divinity666/ruby-grafana-reporter?branch=master)
 [![Gem Version](https://badge.fury.io/rb/ruby-grafana-reporter.svg)](https://badge.fury.io/rb/ruby-grafana-reporter)
 

data/lib/VERSION.rb

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

data/lib/grafana/abstract_datasource.rb

@@ -170,6 +170,7 @@ module Grafana
       # TODO: check how multiple frames have to be handled
       data = data['frames']
       headers = []
+
       data.first['schema']['fields'].each do |headline|
         use_name_only = true
         if not headline['config'].nil?
@@ -180,7 +181,9 @@ module Grafana
         header = use_name_only ? headline['name'] : headline['config']['displayNameFromDS']
         headers << header
       end
-      content = data.first['data']['values'][0].zip(data.first['data']['values'][1])
+
+      # zip all result values together, so that we have one complete table
+      content = data.first['data']['values'][0].zip(*data.first['data']['values'][1..])
       return { header: headers, content: content }
 
     rescue

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/sql_datasource.rb

@@ -15,17 +15,39 @@ module Grafana
       raise MissingSqlQueryError if query_description[:raw_query].nil?
 
       sql = replace_variables(query_description[:raw_query], query_description[:variables])
-      request = {
-        body: {
-          from: query_description[:from],
-          to: query_description[:to],
-          queries: [rawSql: sql, datasourceId: id, format: 'table']
-        }.to_json,
-        request: Net::HTTP::Post
-      }
-
       webrequest = query_description[:prepared_request]
-      webrequest.relative_url = '/api/tsdb/query'
+      request = {}
+
+      ver = query_description[:grafana_version].split('.').map{|x| x.to_i}
+      if ver[0] >= 8
+        webrequest.relative_url = '/api/ds/query'
+        request = {
+          body: {
+            from: query_description[:from],
+            to: query_description[:to],
+            queries: [{
+              datasource: { type: type, uid: uid },
+              datasourceId: id,
+              rawSql: sql,
+              format: 'table',
+              # intervalMs: '',
+              # maxDataPoints: 999,
+              refId: 'A'
+            }]
+          }.to_json,
+          request: Net::HTTP::Post
+        }
+      else
+        webrequest.relative_url = '/api/tsdb/query'
+        request = {
+          body: {
+            from: query_description[:from],
+            to: query_description[:to],
+            queries: [rawSql: sql, datasourceId: id, format: 'table']
+          }.to_json,
+          request: Net::HTTP::Post
+        }
+      end
       webrequest.options.merge!(request)
 
       result = webrequest.execute(query_description[:timeout])

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.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Christian Kohlmeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Reporter Service for Grafana