Fix unit test

add documentation

Fix compilation issue

cmd/grafana-reporter/handler.go

@@ -34,7 +34,7 @@ import (
 
 // ServeReportHandler interface facilitates testsing the reportServing http handler
 type ServeReportHandler struct {
-	newGrafanaClient func(url string, apiToken string, variables url.Values) grafana.Client
+	newGrafanaClient func(url string, apiToken string, variables url.Values, sslCheck bool) grafana.Client
 	newReport        func(g grafana.Client, dashName string, time grafana.TimeRange, texTemplate string) report.Report
 }
 
@@ -47,7 +47,7 @@ func RegisterHandlers(router *mux.Router, reportServerV4, reportServerV5 ServeRe
 
 func (h ServeReportHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	log.Print("Reporter called")
-	g := h.newGrafanaClient(*proto+*ip, apiToken(req), dashVariables(req))
+	g := h.newGrafanaClient(*proto+*ip, apiToken(req), dashVariables(req), *sslCheck)
 	rep := h.newReport(g, dashID(req), time(req), texTemplate(req))
 
 	file, err := rep.Generate()

cmd/grafana-reporter/main.go

@@ -39,7 +39,11 @@ func main() {
 
 	//'generated*'' variables injected from build.gradle: task 'injectGoVersion()'
 	log.Printf("grafana reporter, version: %s.%s-%s hash: %s", generatedMajor, generatedMinor, generatedRelease, generatedGitHash)
-	log.Printf("serving at '%s' and using grafana at '%s'", *port, *ip)
+	sslState := "SSL check"
+	if !*sslCheck {
+		sslState = "No SSL check"
+	}
+	log.Printf("serving at '%s' and using grafana at '%s' %s", *port, *ip, sslState)
 
 	router := mux.NewRouter()
 	RegisterHandlers(

grafana/api_test.go

@@ -37,7 +37,7 @@ func TestGrafanaClientFetchesDashboard(t *testing.T) {
 		defer ts.Close()
 
 		Convey("When using the Grafana v4 client", func() {
-			grf := NewV4Client(ts.URL, "", url.Values{})
+			grf := NewV4Client(ts.URL, "", url.Values{}, true)
 			grf.GetDashboard("testDash")
 
 			Convey("It should use the v4 dashboards endpoint", func() {
@@ -46,7 +46,7 @@ func TestGrafanaClientFetchesDashboard(t *testing.T) {
 		})
 
 		Convey("When using the Grafana v5 client", func() {
-			grf := NewV5Client(ts.URL, "", url.Values{})
+			grf := NewV5Client(ts.URL, "", url.Values{}, true)
 			grf.GetDashboard("rYy7Paekz")
 
 			Convey("It should use the v5 dashboards endpoint", func() {
@@ -77,8 +77,8 @@ func TestGrafanaClientFetchesPanelPNG(t *testing.T) {
 			client      Client
 			pngEndpoint string
 		}{
-			"v4": {NewV4Client(ts.URL, apiToken, variables), "/render/dashboard-solo/db/testDash"},
-			"v5": {NewV5Client(ts.URL, apiToken, variables), "/render/d-solo/testDash/_"},
+			"v4": {NewV4Client(ts.URL, apiToken, variables, true), "/render/dashboard-solo/db/testDash"},
+			"v5": {NewV5Client(ts.URL, apiToken, variables, true), "/render/d-solo/testDash/_"},
 		}
 		for clientDesc, cl := range cases {
 			grf := cl.client
@@ -143,7 +143,7 @@ func TestGrafanaClientFetchPanelPNGErrorHandling(t *testing.T) {
 		}))
 		defer ts.Close()
 
-		grf := NewV4Client(ts.URL, "", url.Values{})
+		grf := NewV4Client(ts.URL, "", url.Values{}, true)
 
 		_, err := grf.GetPanelPng(Panel{44, "singlestat", "title"}, "testDash", TimeRange{"now-1h", "now"})
 
@@ -158,7 +158,7 @@ func TestGrafanaClientFetchPanelPNGErrorHandling(t *testing.T) {
 		}))
 		defer ts.Close()
 
-		grf := NewV4Client(ts.URL, "", url.Values{})
+		grf := NewV4Client(ts.URL, "", url.Values{}, true)
 
 		_, err := grf.GetPanelPng(Panel{44, "singlestat", "title"}, "testDash", TimeRange{"now-1h", "now"})
 

readme.md

@@ -1,18 +1,19 @@
-
 # Grafana reporter <img style="float: right;" src="https://travis-ci.org/IzakMarais/reporter.svg?branch=master">
 
-A simple http service that generates *.PDF reports from [Grafana](http://grafana.org/) dashboards.
+A simple http service that generates \*.PDF reports from [Grafana](http://grafana.org/) dashboards.
 
 ![demo](demo/report_v5.gif)
 
 ## Requirements
 
 Runtime requirements
-* `pdflatex` installed and available in PATH.
-* a running Grafana instance that it can connect to. If you are using an old Grafana (version < v5.0), see  `Deprecated Endpoint` below.
+
+- `pdflatex` installed and available in PATH.
+- a running Grafana instance that it can connect to. If you are using an old Grafana (version < v5.0), see `Deprecated Endpoint` below.
 
 Build requirements:
-* [golang](https://golang.org/)
+
+- [golang](https://golang.org/)
 
 ## Getting started
 
@@ -34,6 +35,10 @@ Query available flags:
 
     grafana-reporter --help
 
+Deactivates the SSL checks:
+
+    grafana-reporter -ssl-check false
+
 ### Generate a dashboard report
 
 #### Endpoint
@@ -96,7 +101,7 @@ If you also have `Make` and `Docker-compose` installed, you can run a simple loc
      make compose-up
 
 Then open a browser to `http://localhost:3000` and create a new test dashboard. Add the example graph and save the dashboard.
-Observe the new URL and find the dashboard UID, e.g. `qaJCuCezz` from  `http://localhost:3000/d/qaJCuCezz/new-dashboard-copy`
+Observe the new URL and find the dashboard UID, e.g. `qaJCuCezz` from `http://localhost:3000/d/qaJCuCezz/new-dashboard-copy`
 Next, go to: `http://localhost:8080/api/v5/report/qaJCuCezz`, which will output the grafana-reporter PDF.
 
 ## Development
@@ -113,5 +118,5 @@ or, the [GoConvey](http://goconvey.co/) webGUI:
 
 ### Release
 
-A new release requires changes to the git tag, `cmd/grafana-reporter/version.go` and `Makefile: docker-build` job. 
+A new release requires changes to the git tag, `cmd/grafana-reporter/version.go` and `Makefile: docker-build` job.
 Build the Docker image and push to Dockerhub.