Fix granularity.

Dockerfile.golang

@@ -0,0 +1,21 @@
+# syntax=docker/dockerfile:1
+
+# Node build
+ARG BASE_IMAGE=alpine:3.18.3
+ARG JS_IMAGE=node:16-alpine3.18
+ARG JS_PLATFORM=linux/amd64
+ARG GO_IMAGE=golang:1.16
+
+FROM ${GO_IMAGE} as go-builder-1
+
+WORKDIR /tmp/grafana
+
+COPY go.* ./
+COPY Magefile.go .
+COPY pkg pkg
+COPY src src
+
+RUN go mod tidy
+
+RUN git clone https://github.com/magefile/mage
+RUN cd mage && go run bootstrap.go && go install

Dockerfile.node

@@ -0,0 +1,24 @@
+# syntax=docker/dockerfile:1
+
+# Node build
+ARG BASE_IMAGE=alpine:3.18.3
+ARG JS_IMAGE=node:16-alpine3.18
+ARG JS_PLATFORM=linux/amd64
+ARG GO_IMAGE=golang:1.16
+
+ARG GO_SRC=go-builder
+ARG JS_SRC=js-builder
+
+FROM --platform=${JS_PLATFORM} ${JS_IMAGE} as js-builder-1
+
+WORKDIR /tmp/grafana
+
+COPY package.json yarn.lock ./
+RUN yarn install --immutable
+
+COPY tsconfig.json .prettierrc.js  ./
+COPY img img
+COPY src src
+COPY README.md LICENSE CHANGELOG.md .
+
+ENV NODE_ENV production

Magefile.go

@@ -11,7 +11,7 @@ import (
 
 // Build build for all archs
 func Build() {
-	fmt.Println("Build all archs!")
+	fmt.Println("Building plugin")
 	build.BuildAll()
 }
 

Makefile

@@ -22,7 +22,11 @@ build:
 	@yarn build
 	@mage -v
 
-run: build
+build-with-docker:
+	@docker compose run --remove-orphans go-builder
+	@docker compose run --remove-orphans js-builder 
+
+run:
 	@docker compose up grafana
 
 package_node:

README.md

@@ -1,5 +1,6 @@
 # Youbora data source for Grafana
-<img src="img/logo.png" width="64" style="float:right"/>
+
+<img src="src/img/logo.png" width="64" style="float:right"/>
 
 The Youbora data source plugin allows you to query and visualize Youbora data from within Grafana.
 
@@ -25,15 +26,13 @@ Follow [these instructions](https://grafana.com/docs/grafana/latest/datasources/
 
 You will need an API key from Youbora. You can generate one at your instance web interface or ask for help.
 
-
 ## Querying
 
-<img src="img/screenshot-edit1.png" />
+<img src="src/img/screenshot-edit1.png" />
 
 ## Visualizing
 
-<img src="img/screenshot-dashboard1.png" />
-
+<img src="src/img/screenshot-dashboard1.png" />
 
 ## Learn more
 

docker-compose.yaml

@@ -3,7 +3,7 @@ version: '3.1'
 services:
 
   grafana:
-    image: grafana/grafana:8.5.1
+    image: grafana/grafana:9.3.8
     restart: always
     ports:
       - 3000:3000
@@ -13,10 +13,30 @@ services:
       GF_LOG_LEVEL: "debug"
     volumes:
       - grafana-data:/var/lib/grafana
-      - ./:/var/lib/grafana/plugins/youbora-datasource
+      - ./:/var/lib/grafana/plugins/globocom-youbora-datasource
+
+  js-builder:
+    build:
+      context: .
+      dockerfile: Dockerfile.node
+    restart: always
+    volumes:
+      - ./dist/:/tmp/grafana/dist/
+    entrypoint: /bin/sh -c
+    command: yarn build
+
+  go-builder:
+    build:
+      context: .
+      dockerfile: Dockerfile.golang
+    restart: always
+    volumes:
+      - ./dist/:/tmp/grafana/dist/
+    entrypoint: /bin/sh -c
+    command: mage build:linux
 
   console:
-    image: grafana/grafana:8.5.1
+    image: grafana/grafana:9.3.8
     restart: always
     ports:
       - 3000:3000
@@ -25,7 +45,7 @@ services:
     environment:
       GF_DEFAULT_APP_MODE: "development"
     entrypoint: /bin/sh -c
-    command: /bin/sh
+    command: /bin/bash
 
 volumes:
   grafana-data:

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "nedimar-youbora-datasource",
+  "name": "globocom-youbora-datasource",
   "version": "1.0.5",
   "description": "NPAW's Youbora data source plugin",
   "scripts": {

pkg/main.go

@@ -17,7 +17,7 @@ func main() {
 	// from Grafana to create different instances of SampleDatasource (per datasource
 	// ID). When datasource configuration changed Dispose method will be called and
 	// new datasource instance created using NewSampleDatasource factory.
-	if err := datasource.Manage("nedimar-youbora-datasource", plugin.NewYouboraDataSource, datasource.ManageOpts{}); err != nil {
+	if err := datasource.Manage("globocom-youbora-datasource", plugin.NewYouboraDataSource, datasource.ManageOpts{}); err != nil {
 		log.DefaultLogger.Error(err.Error())
 		os.Exit(1)
 	}

pkg/plugin/parsers.go

@@ -55,10 +55,10 @@ func ParseQuery(dq backend.DataQuery, qm *QueryModel) error {
 
 	// setup granularity.
 	qm.Granularity = "minute"
-	if dq.Interval.Minutes() > 120 {
+	if dq.Interval.Minutes() > 2 {
 		qm.Granularity = "hour"
 	}
-	if dq.Interval.Hours() > 48 {
+	if dq.Interval.Hours() > 2 {
 		qm.Granularity = "day"
 	}
 

pkg/plugin/plugin.go

@@ -162,20 +162,27 @@ func (d *YouboraDataSource) doRequest(ctx context.Context, qm *QueryModel) (body
 	url := buildQuery(d, qm)
 
 	rsp, err := d.httpclient.Get(url)
+	log.DefaultLogger.Debug("DEBUG URL", "url", url)
+
 	if err != nil {
 		log.DefaultLogger.Error("failed executing GET.", "error", err)
 
 		return body, err
 	}
 	defer rsp.Body.Close()
 
-	if rsp.StatusCode > 399 {
-		return nil, fmt.Errorf("invalid HTTP response %v", rsp.Status)
-	}
-
 	if body, err = io.ReadAll(rsp.Body); err != nil {
 		return nil, err
 	}
 
+	if rsp.StatusCode > 399 {
+		var parsed map[string]interface{}
+		err := json.Unmarshal(body, &parsed)
+		if err != nil {
+			return nil, fmt.Errorf("invalid HTTP response %v (invalid response json)", rsp.Status)
+		}
+		return nil, fmt.Errorf("invalid API request: %v", parsed)
+	}
+
 	return body, err
 }

src/plugin.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/master/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
   "name": "Youbora",
-  "id": "nedimar-youbora-datasource",
+  "id": "globocom-youbora-datasource",
   "metrics": true,
   "backend": true,
   "alerting": true,