ruby-grafana-reporter 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00837acead340b75df1bc4dcdf93c05c8014c1317aae288191b592b77a660a7a'
-  data.tar.gz: 2e072de19e45e7fe5f167f37ec4a88be2a482bf7843df96f059a9489e48760b6
+  metadata.gz: e9e3324f4e9d6fa3a47963a73ae4371122f603039284d0b453ac2f62881c5b93
+  data.tar.gz: 535a8f6f2763a5689472a423090504bbd5eed6b5610a557c7d9452999694f52c
 SHA512:
-  metadata.gz: eec08117ef1a83e7c0a016e80cce31c67fcf552253b63141a440951fa94f1168531b31131ae5cc79e50ac14bf4161a867b717f1c2bfb77ed6d0edac985b7cc38
-  data.tar.gz: fe05d5a7baeb91411fb5942602cd66a66ae8dfcc65eedb7cf421617ffa6c827f5d2a11306dc33ffae9370033a35c10883c17c11f25d8a431bebaf7ae476af4ef
+  metadata.gz: e77dd83050e40196334058503c902ac6fc9285bf13a4ac8398ec9ffcf724160b30091ac6994cbff48326b4512499ccc7f0358f291e9af417a3903b8cfb2ac32d
+  data.tar.gz: 2c46bc4ccdd59cd49588e292e1882662b40cde32a50898e14e33eb1f50fffdd5334c86c837bb3e249155002cd80c78af51bfd9897e176654eeece1ebd2d92084

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, 2].freeze
 # Release date
-GRAFANA_REPORTER_RELEASE_DATE = '2022-08-30'
+GRAFANA_REPORTER_RELEASE_DATE = '2022-09-14'

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/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])

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.2
 platform: ruby
 authors:
 - Christian Kohlmeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-14 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