mirror of
https://github.com/NationalSecurityAgency/timely.git
synced 2026-11-09 17:36:01 -10:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Bill Oley
|
bb479a58d7 | ||
|
Bill Oley
|
ff37d40801 | ||
|
Bill Oley
|
a7d980975e | ||
|
dependabot[bot]
|
30f5a0c1b2 |
No files matched your search
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>timely-analytics</artifactId>
|
||||
<!--
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>timely-balancer</artifactId>
|
||||
<dependencies>
|
||||
|
||||
+2
-2
@@ -4,13 +4,13 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>timely-client</artifactId>
|
||||
<properties>
|
||||
<!-- PEP 440 compliant version gets substituted into src/main/python/template/setup.py -->
|
||||
<!-- use .dev0 instead of -SNAPSHOT -->
|
||||
<python.client.version>1.3.1.dev0</python.client.version>
|
||||
<python.client.version>1.3.1</python.client.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>collectd-nsq-plugin</artifactId>
|
||||
<dependencies>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>collectd-plugin-parent</artifactId>
|
||||
<dependencies>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>collectd-timely-plugin</artifactId>
|
||||
<dependencies>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>timely-common</artifactId>
|
||||
<dependencies>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>grafana-auth</artifactId>
|
||||
<dependencies>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>timely-app</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
Vendored
+1
-10
@@ -73571,16 +73571,7 @@ function (_super) {
|
||||
tooltip: "Allow ssl connection with unverified or self-signed certificates",
|
||||
checked: jsonData.allowInsecureSsl || false,
|
||||
onChange: this.onAllowInsecureSslChange
|
||||
})), react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("div", {
|
||||
className: "gf-form"
|
||||
}, react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("p", null, react__WEBPACK_IMPORTED_MODULE_2___default.a.createElement("a", {
|
||||
className: "external-link",
|
||||
target: "_blank",
|
||||
href: "",
|
||||
onClick: function onClick() {
|
||||
return window.open("https://" + jsonData.timelyHost + ":" + jsonData.httpsPort + "/version", "_blank");
|
||||
}
|
||||
}, "Open a new browser tab/window to test https access"))));
|
||||
})));
|
||||
};
|
||||
|
||||
return ConfigEditor;
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///../node_modules/@babel/runtime/helpers/assertThisInitialized.js","webpack:///../node_modules/@babel/runtime/helpers/defineProperty.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayWithoutHoles.js","webpack:///../node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js","webpack:///../node_modules/@babel/runtime/helpers/esm/classCallCheck.js","webpack:///../node_modules/@babel/runtime/helpers/esm/createClass.js","webpack:///../node_modules/@babel/runtime/helpers/esm/defineProperty.js","webpack:///../node_modules/@babel/runtime/helpers/esm/extends.js","webpack:///../node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js","webpack:///../node_modules/@babel/runtime/helpers/esm/inherits.js","webpack:///../node_modules/@babel/runtime/helpers/esm/inheritsLoose.js","webpack:///../node_modules/@babel/runtime/helpers/esm/iterableToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js","webpack:///../node_modules/@babel/runtime/helpers/esm/nonIterableRest.js","webpack:///../node_modules/@babel/runtime/helpers/esm/nonIterableSpread.js","webpack:///../node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js","webpack:///../node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js","webpack:///../node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js","webpack:///../node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js","webpack:///../node_modules/@babel/runtime/helpers/esm/slicedToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/toArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/toConsumableArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/typeof.js","webpack:///../node_modules/@babel/runtime/helpers/esm/unsupportedIterableToArray.js","webpack:///../node_modules/@babel/runtime/helpers/extends.js","webpack:///../node_modules/@babel/runtime/helpers/inheritsLoose.js","webpack:///../node_modules/@babel/runtime/helpers/objectWithoutPropertiesLoose.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/Accordion.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/AccordionContext.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionActions/AccordionActions.js","webpack:///../node_modules/@material-ui/core/esm/AccordionActions/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionDetails/AccordionDetails.js","webpack:///../node_modules/@material-ui/core/esm/AccordionDetails/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionSummary/AccordionSummary.js","webpack:///../node_modules/@material-ui/core/esm/AccordionSummary/index.js","webpack:///../node_modules/@material-ui/core/esm/AppBar/AppBar.js","webpack:///../node_modules/@material-ui/core/esm/AppBar/index.js","webpack:///../node_modules/@material-ui/core/esm/Avatar/Avatar.js","webpack:///../node_modules/@material-ui/core/esm/Avatar/index.js","webpack:///../node_modules/@material-ui/core/esm/Backdrop/Backdrop.js","webpack:///../node_modules/@material-ui/core/esm/Backdrop/index.js","webpack:///../node_modules/@material-ui/core/esm/Badge/Badge.js","webpack:///../node_modules/@material-ui/core/esm/Badge/index.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigation/BottomNavigation.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigation/index.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigationAction/BottomNavigationAction.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigationAction/index.js","webpack:///../node_modules/@material-ui/core/esm/Box/Box.js","webpack:///../node_modules/@material-ui/core/esm/Box/index.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/BreadcrumbCollapsed.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/Breadcrumbs.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/index.js","webpack:///../node_modules/@material-ui/core/esm/Button/Button.js","webpack:///../node_modules/@material-ui/core/esm/Button/index.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/ButtonBase.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/Ripple.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/TouchRipple.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/index.js","webpack:///../node_modules/@material-ui/core/esm/ButtonGroup/ButtonGroup.js","webpack:///../node_modules/@material-ui/core/esm/ButtonGroup/index.js","webpack:///../node_modules/@material-ui/core/esm/Card/Card.js","webpack:///../node_modules/@material-ui/core/esm/Card/index.js","webpack:///../node_modules/@material-ui/core/esm/CardActionArea/CardActionArea.js"Line truncated
|
||||
{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///../node_modules/@babel/runtime/helpers/assertThisInitialized.js","webpack:///../node_modules/@babel/runtime/helpers/defineProperty.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayWithoutHoles.js","webpack:///../node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js","webpack:///../node_modules/@babel/runtime/helpers/esm/classCallCheck.js","webpack:///../node_modules/@babel/runtime/helpers/esm/createClass.js","webpack:///../node_modules/@babel/runtime/helpers/esm/defineProperty.js","webpack:///../node_modules/@babel/runtime/helpers/esm/extends.js","webpack:///../node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js","webpack:///../node_modules/@babel/runtime/helpers/esm/inherits.js","webpack:///../node_modules/@babel/runtime/helpers/esm/inheritsLoose.js","webpack:///../node_modules/@babel/runtime/helpers/esm/iterableToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js","webpack:///../node_modules/@babel/runtime/helpers/esm/nonIterableRest.js","webpack:///../node_modules/@babel/runtime/helpers/esm/nonIterableSpread.js","webpack:///../node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js","webpack:///../node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js","webpack:///../node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js","webpack:///../node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js","webpack:///../node_modules/@babel/runtime/helpers/esm/slicedToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/toArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/toConsumableArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/typeof.js","webpack:///../node_modules/@babel/runtime/helpers/esm/unsupportedIterableToArray.js","webpack:///../node_modules/@babel/runtime/helpers/extends.js","webpack:///../node_modules/@babel/runtime/helpers/inheritsLoose.js","webpack:///../node_modules/@babel/runtime/helpers/objectWithoutPropertiesLoose.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/Accordion.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/AccordionContext.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionActions/AccordionActions.js","webpack:///../node_modules/@material-ui/core/esm/AccordionActions/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionDetails/AccordionDetails.js","webpack:///../node_modules/@material-ui/core/esm/AccordionDetails/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionSummary/AccordionSummary.js","webpack:///../node_modules/@material-ui/core/esm/AccordionSummary/index.js","webpack:///../node_modules/@material-ui/core/esm/AppBar/AppBar.js","webpack:///../node_modules/@material-ui/core/esm/AppBar/index.js","webpack:///../node_modules/@material-ui/core/esm/Avatar/Avatar.js","webpack:///../node_modules/@material-ui/core/esm/Avatar/index.js","webpack:///../node_modules/@material-ui/core/esm/Backdrop/Backdrop.js","webpack:///../node_modules/@material-ui/core/esm/Backdrop/index.js","webpack:///../node_modules/@material-ui/core/esm/Badge/Badge.js","webpack:///../node_modules/@material-ui/core/esm/Badge/index.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigation/BottomNavigation.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigation/index.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigationAction/BottomNavigationAction.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigationAction/index.js","webpack:///../node_modules/@material-ui/core/esm/Box/Box.js","webpack:///../node_modules/@material-ui/core/esm/Box/index.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/BreadcrumbCollapsed.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/Breadcrumbs.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/index.js","webpack:///../node_modules/@material-ui/core/esm/Button/Button.js","webpack:///../node_modules/@material-ui/core/esm/Button/index.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/ButtonBase.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/Ripple.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/TouchRipple.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/index.js","webpack:///../node_modules/@material-ui/core/esm/ButtonGroup/ButtonGroup.js","webpack:///../node_modules/@material-ui/core/esm/ButtonGroup/index.js","webpack:///../node_modules/@material-ui/core/esm/Card/Card.js","webpack:///../node_modules/@material-ui/core/esm/Card/index.js","webpack:///../node_modules/@material-ui/core/esm/CardActionArea/CardActionArea.js"Line truncated
|
||||
Vendored
+1
-1
@@ -30,7 +30,7 @@
|
||||
}
|
||||
],
|
||||
"screenshots": [],
|
||||
"version": "1.3.1-SNAPSHOT",
|
||||
"version": "1.3.1",
|
||||
"updated": "2020-10-14"
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "timely-datasource",
|
||||
"version": "1.3.1-SNAPSHOT",
|
||||
"version": "1.3.1",
|
||||
"description": "Timely",
|
||||
"backend": true,
|
||||
"alerting": true,
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
|
||||
"sync"
|
||||
)
|
||||
|
||||
type TimelyDatasourceInstanceSettings struct {
|
||||
|
||||
}
|
||||
|
||||
func newDataSourceInstance(setting backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
|
||||
return &TimelyDatasourceInstanceSettings{
|
||||
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *TimelyDatasourceInstanceSettings) Dispose() {
|
||||
// Called before creating a new instance to allow plugin authors
|
||||
// to cleanup.
|
||||
}
|
||||
|
||||
func getServeOpts() datasource.ServeOpts {
|
||||
// creates a instance manager for your plugin. The function passed
|
||||
// into `NewInstanceManger` is called when the instance is created
|
||||
// for the first time or when a datasource configuration changed.
|
||||
im := datasource.NewInstanceManager(newDataSourceInstance)
|
||||
ds := &TimelyDatasource{
|
||||
im: im,
|
||||
CertPool: nil,
|
||||
Certificate: nil,
|
||||
ClientCertificatePath: "",
|
||||
ClientKeyPath: "",
|
||||
CertificateAuthorityPath: "",
|
||||
Mutex: &sync.Mutex{},
|
||||
}
|
||||
|
||||
return datasource.ServeOpts{
|
||||
QueryDataHandler: ds,
|
||||
CheckHealthHandler: ds,
|
||||
CallResourceHandler: ds,
|
||||
}
|
||||
}
|
||||
|
||||
func (ds *TimelyDatasource) getSettings(pluginContext backend.PluginContext) (*TimelyDatasourceInstanceSettings, error) {
|
||||
iface, err := ds.im.Get(pluginContext)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return iface.(*TimelyDatasourceInstanceSettings), nil
|
||||
}
|
||||
|
||||
// QueryData handles multiple queries and returns multiple responses.
|
||||
// req contains the queries []DataQuery (where each query contains RefID as a unique identifer).
|
||||
// The QueryDataResponse contains a map of RefID to the response for each query, and each response
|
||||
// contains Frames ([]*Frame).
|
||||
func (td *TimelyDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
|
||||
// create response struct
|
||||
response := backend.NewQueryDataResponse()
|
||||
|
||||
// loop over queries and execute them individually.
|
||||
for _, q := range req.Queries {
|
||||
res, error := td.Query(req, q)
|
||||
if error != nil {
|
||||
errorResponse := backend.DataResponse{
|
||||
Error: error,
|
||||
}
|
||||
response.Responses[q.RefID] = errorResponse
|
||||
} else {
|
||||
// save the response in a hashmap
|
||||
// based on with RefID as identifier
|
||||
response.Responses[q.RefID] = *res
|
||||
}
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
// CheckHealth handles health checks sent from Grafana to the plugin.
|
||||
// The main use case for these health checks is the test button on the
|
||||
// datasource configuration page which allows users to verify that
|
||||
// a datasource is working as expected.
|
||||
func (td *TimelyDatasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
|
||||
var status = backend.HealthStatusOk
|
||||
var message = ""
|
||||
|
||||
return &backend.CheckHealthResult{
|
||||
Status: status,
|
||||
Message: message,
|
||||
}, nil
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
|
||||
)
|
||||
|
||||
func main() {
|
||||
// Start listening to requests send from Grafana. This call is blocking so
|
||||
// it wont finish until Grafana shutsdown the process or the plugin choose
|
||||
// to exit close down by itself
|
||||
err := datasource.Serve(getServeOpts())
|
||||
|
||||
// Log any error if we could start the plugin.
|
||||
if err != nil {
|
||||
logger.Error(err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func (dataSource *TimelyDatasource) CallResource(ctx context.Context, request *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
|
||||
|
||||
if (request.Body == nil) {
|
||||
logger.Debug("CallResource", "Path", request.Path, "URL", request.URL)
|
||||
} else {
|
||||
logger.Debug("CallResource", "Path", request.Path, "URL", request.URL, "Body", string(request.Body))
|
||||
}
|
||||
var response backend.CallResourceResponse
|
||||
pluginContext := request.PluginContext
|
||||
var httpResponse *http.Response;
|
||||
var timelyDataSourceOptions TimelyDataSourceOptions
|
||||
err := json.Unmarshal(pluginContext.DataSourceInstanceSettings.JSONData, &timelyDataSourceOptions)
|
||||
if err != nil {
|
||||
logger.Error("Error unmarshalling datasource JSONData", "error", err)
|
||||
return err
|
||||
}
|
||||
|
||||
httpClient, err := dataSource.GetHttpClient(timelyDataSourceOptions, true)
|
||||
if err != nil {
|
||||
logger.Error("Error getting httpClient", "error", err)
|
||||
return err
|
||||
}
|
||||
|
||||
if strings.HasPrefix(request.Path, "/api/aggregators") ||
|
||||
strings.HasPrefix(request.Path, "/api/suggest") ||
|
||||
strings.HasPrefix(request.Path, "/api/search/lookup") {
|
||||
|
||||
if (request.Method == "GET") {
|
||||
var x = strings.Index(request.URL, request.Path);
|
||||
finalParams := "";
|
||||
if (x > -1) {
|
||||
params := request.URL[x+len(request.Path) : len(request.URL)];
|
||||
|
||||
if (len(params) > 0 && strings.HasPrefix(params, "?")) {
|
||||
finalParams = params;
|
||||
}
|
||||
}
|
||||
url, err := url.Parse("https://" + timelyDataSourceOptions.TimelyHost + ":" + timelyDataSourceOptions.HttpsPort + request.Path + finalParams);
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
httpResponse, err = httpClient.Get(url.String())
|
||||
} else if (request.Method == "POST") {
|
||||
url, err := url.Parse("https://" + timelyDataSourceOptions.TimelyHost + ":" + timelyDataSourceOptions.HttpsPort + request.Path);
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
httpResponse, err = httpClient.Post(url.String(), "application/json", bytes.NewReader(request.Body))
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
logger.Error("Error calling for resource", "Path", request.Path, "error", err)
|
||||
return err
|
||||
}
|
||||
bytes, err := ioutil.ReadAll(httpResponse.Body)
|
||||
if err != nil {
|
||||
logger.Error("Error reading resource", "Path", request.Path, "error", err)
|
||||
return err
|
||||
}
|
||||
response.Status = 200
|
||||
response.Body = bytes
|
||||
} else {
|
||||
// no matching resource
|
||||
response.Status = 404
|
||||
}
|
||||
sender.Send(&response)
|
||||
return nil
|
||||
}
|
||||
+496
-332
@@ -1,362 +1,526 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"fmt"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/data"
|
||||
"github.com/hashicorp/go-hclog"
|
||||
"sort"
|
||||
"strconv"
|
||||
"sync"
|
||||
"time"
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"fmt"
|
||||
"os"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/data"
|
||||
"github.com/hashicorp/go-hclog"
|
||||
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
var (
|
||||
logger = hclog.New(&hclog.LoggerOptions{
|
||||
// Use debug as level since anything less severe is suppressed.
|
||||
Level: hclog.Debug,
|
||||
// Use JSON format to make the output in Grafana format and work
|
||||
// when using multiple arguments such as Debug("message", "key", "value").
|
||||
JSONFormat: true,
|
||||
Name: "timely",
|
||||
})
|
||||
logger = hclog.New(&hclog.LoggerOptions{
|
||||
// Use debug as level since anything less severe is suppressed.
|
||||
Level: hclog.Debug,
|
||||
// Use JSON format to make the output in Grafana format and work
|
||||
// when using multiple arguments such as Debug("message", "key", "value").
|
||||
JSONFormat: true,
|
||||
Name: "timely",
|
||||
})
|
||||
)
|
||||
|
||||
func init() {
|
||||
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
|
||||
}
|
||||
|
||||
type TimelyDatasource struct {
|
||||
im instancemgmt.InstanceManager
|
||||
Certificate *tls.Certificate
|
||||
CertPool *x509.CertPool
|
||||
ClientCertificatePath string
|
||||
ClientKeyPath string
|
||||
CertificateAuthorityPath string
|
||||
Mutex *sync.Mutex
|
||||
im instancemgmt.InstanceManager
|
||||
Certificate *tls.Certificate
|
||||
CertPool *x509.CertPool
|
||||
ClientCertificatePath string
|
||||
ClientKeyPath string
|
||||
CertificateAuthorityPath string
|
||||
Mutex *sync.Mutex
|
||||
}
|
||||
|
||||
func (dataSource *TimelyDatasource) Query(queryDataRequest *backend.QueryDataRequest, dataQuery backend.DataQuery) (*backend.DataResponse, error) {
|
||||
|
||||
timelyRequest := TimelyRequest {
|
||||
MsResolution: true,
|
||||
GlobalAnnotations: true,
|
||||
Start: dataQuery.TimeRange.From.Unix() * 1000,
|
||||
End: dataQuery.TimeRange.To.Unix() * 1000,
|
||||
}
|
||||
|
||||
var timelyQueryForm TimelyQueryForm
|
||||
var timelyQueryServer TimelyQueryServer
|
||||
var err error
|
||||
var isUser bool
|
||||
|
||||
if queryDataRequest.PluginContext.User == nil {
|
||||
isUser = false
|
||||
err = json.Unmarshal(dataQuery.JSON, &timelyQueryServer)
|
||||
if err == nil {
|
||||
timelyQueryForm = TimelyQueryForm {
|
||||
Metric: timelyQueryServer.Metric,
|
||||
Aggregator: timelyQueryServer.Aggregator,
|
||||
DisableDownsampling: timelyQueryServer.DisableDownsampling,
|
||||
DownsampleAggregator: timelyQueryServer.DownsampleAggregator,
|
||||
DownsampleFillPolicy: timelyQueryServer.DownsampleFillPolicy,
|
||||
DownsampleInterval: timelyQueryServer.DownsampleInterval,
|
||||
Tags: timelyQueryServer.Tags,
|
||||
Filters: timelyQueryServer.Filters,
|
||||
ShouldComputeRate: timelyQueryServer.ShouldComputeRate,
|
||||
IsCounter: timelyQueryServer.IsCounter,
|
||||
CounterMax: timelyQueryServer.CounterMax,
|
||||
CounterResetValue: timelyQueryServer.CounterResetValue,
|
||||
Tsuids: timelyQueryServer.Tsuids,
|
||||
QueryType: timelyQueryServer.QueryType,
|
||||
RefId: timelyQueryServer.RefId,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
isUser = true
|
||||
err = json.Unmarshal(dataQuery.JSON, &timelyQueryForm)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
logger.Error("Failed parsing timelyQuery", "error", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
timelyQuery := dataSource.convertTimelyQuery(&timelyQueryForm)
|
||||
timelyRequest.Queries = append(timelyRequest.Queries, *timelyQuery)
|
||||
|
||||
logger.Debug("Query", "timelyRequest", timelyRequest)
|
||||
|
||||
var timelyDatasourceOptions TimelyDataSourceOptions
|
||||
|
||||
err = json.Unmarshal(queryDataRequest.PluginContext.DataSourceInstanceSettings.JSONData, &timelyDatasourceOptions)
|
||||
if err != nil {
|
||||
logger.Error("Error unmarshalling datasource JSONData", "error", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var httpRequest *http.Request
|
||||
httpRequest, err = dataSource.createRequest(timelyDatasourceOptions, timelyRequest)
|
||||
if err != nil {
|
||||
logger.Error("Error creating httpRequest", "error", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
oauthToken, tokenExists := queryDataRequest.Headers["Authorization"]
|
||||
if tokenExists {
|
||||
logger.Debug("Adding Authorization:" + oauthToken)
|
||||
httpRequest.Header.Add("Authorization", oauthToken)
|
||||
}
|
||||
|
||||
var useClientCertIfAvailable = !isUser || (!tokenExists && timelyDatasourceOptions.UseClientCertWhenOAuthMissing)
|
||||
httpClient, err := dataSource.GetHttpClient(timelyDatasourceOptions, useClientCertIfAvailable)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
res, err := httpClient.Do(httpRequest)
|
||||
if err != nil {
|
||||
logger.Error("Error executing query", "error", err)
|
||||
return nil, err
|
||||
}
|
||||
return dataSource.parseResponse(res)
|
||||
type TimelyDatasourceInstanceSettings struct {
|
||||
}
|
||||
|
||||
func (e *TimelyDatasource) createRequest(tdo TimelyDataSourceOptions, data TimelyRequest) (*http.Request, error) {
|
||||
u, err := url.Parse("https://" + tdo.TimelyHost + ":" + tdo.HttpsPort + "/api/query")
|
||||
if err != nil {
|
||||
logger.Error("Failed creating query url", "error", err)
|
||||
return nil, fmt.Errorf("Failed creating query url. error: %v", err)
|
||||
}
|
||||
postData, err := json.Marshal(data)
|
||||
if err != nil {
|
||||
logger.Error("Failed marshaling data", "error", err)
|
||||
return nil, fmt.Errorf("Failed to create request. error: %v", err)
|
||||
}
|
||||
req, err := http.NewRequest(http.MethodPost, u.String(), bytes.NewReader(postData))
|
||||
if err != nil {
|
||||
logger.Error("Failed to create request", "error", err)
|
||||
return nil, fmt.Errorf("Failed to create request. error: %v", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
||||
requestData, err := json.Marshal(data)
|
||||
if err != nil {
|
||||
logger.Error("Failed marshaling request", "error", err)
|
||||
} else {
|
||||
logger.Info("Created query request: " + string(requestData))
|
||||
}
|
||||
return req, err
|
||||
func newDataSourceInstance(setting backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
|
||||
return &TimelyDatasourceInstanceSettings{}, nil
|
||||
}
|
||||
|
||||
func (e *TimelyDatasource) parseResponse(res *http.Response) (*backend.DataResponse, error) {
|
||||
|
||||
body, err := ioutil.ReadAll(res.Body)
|
||||
defer res.Body.Close()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if res.StatusCode/100 != 2 {
|
||||
var errorResponse TimelyErrorResponse
|
||||
err = json.Unmarshal(body, &errorResponse)
|
||||
if err != nil {
|
||||
logger.Error("Query failed", "status", res.Status, "body", string(body))
|
||||
return nil, fmt.Errorf("Query failed - %v: %s", res.Status, string(body))
|
||||
}
|
||||
logger.Error("Query failed", "status", res.Status, "message", errorResponse.Message, "detailMessage", errorResponse.DetailMessage)
|
||||
return nil, fmt.Errorf("Query failed - %v [%s] [%s]", res.Status, errorResponse.Message, errorResponse.DetailMessage)
|
||||
}
|
||||
|
||||
var object []TimelyResponse
|
||||
err = json.Unmarshal(body, &object)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Failed to unmarshal Timely response - body: %s status: %v", string(body), res.Status)
|
||||
}
|
||||
|
||||
response := backend.DataResponse{}
|
||||
|
||||
for _, val := range object {
|
||||
var name = val.Metric;
|
||||
for k, v := range val.Tags {
|
||||
name = name + " " + k + "=" + v;
|
||||
}
|
||||
frame := data.NewFrame(name)
|
||||
timestamps := make([]*time.Time, 0)
|
||||
values := make([]*float64, 0)
|
||||
keys := make([]int64, 0, len(val.DataPoints));
|
||||
for k := range val.DataPoints {
|
||||
keys = append(keys, k);
|
||||
}
|
||||
|
||||
sort.Slice(keys, func(i, j int) bool {
|
||||
return keys[i] < keys[j];
|
||||
});
|
||||
|
||||
for _, timestampInt64 := range keys {
|
||||
value := val.DataPoints[timestampInt64];
|
||||
timestampTime := time.Unix(timestampInt64/1000, 0);
|
||||
timestamps = append(timestamps, ×tampTime)
|
||||
newValue := float64(value);
|
||||
values = append(values, &newValue)
|
||||
}
|
||||
frame.Fields = append(frame.Fields, data.NewField("time", val.Tags, timestamps))
|
||||
frame.Fields = append(frame.Fields, data.NewField(val.Metric, val.Tags, values))
|
||||
response.Frames = append(response.Frames, frame)
|
||||
}
|
||||
// add the frames to the response
|
||||
return &response, nil
|
||||
func (s *TimelyDatasourceInstanceSettings) Dispose() {
|
||||
// Called before creating a new instance to allow plugin authors
|
||||
// to cleanup.
|
||||
}
|
||||
|
||||
func (e *TimelyDatasource) convertTimelyQuery(timelyQueryForm *TimelyQueryForm) *TimelyQuery {
|
||||
func getServeOpts() datasource.ServeOpts {
|
||||
// creates a instance manager for your plugin. The function passed
|
||||
// into `NewInstanceManger` is called when the instance is created
|
||||
// for the first time or when a datasource configuration changed.
|
||||
im := datasource.NewInstanceManager(newDataSourceInstance)
|
||||
ds := &TimelyDatasource{
|
||||
im: im,
|
||||
CertPool: nil,
|
||||
Certificate: nil,
|
||||
ClientCertificatePath: "",
|
||||
ClientKeyPath: "",
|
||||
CertificateAuthorityPath: "",
|
||||
Mutex: &sync.Mutex{},
|
||||
}
|
||||
|
||||
if timelyQueryForm == nil {
|
||||
return nil
|
||||
}
|
||||
timelyQuery := TimelyQuery{
|
||||
Metric: timelyQueryForm.Metric,
|
||||
Aggregator: "none",
|
||||
Rate: false,
|
||||
RateOptions: RateOptions{},
|
||||
Downsample: "60000ms-avg",
|
||||
Tags: timelyQueryForm.Tags,
|
||||
Filters: timelyQueryForm.Filters,
|
||||
Tsuids: timelyQueryForm.Tsuids,
|
||||
}
|
||||
|
||||
// future work - replace scopedVariables in metric, tags, filters, aggregator
|
||||
|
||||
timelyQuery.Aggregator = "avg"
|
||||
|
||||
if timelyQueryForm.Aggregator != "" {
|
||||
timelyQuery.Aggregator = timelyQueryForm.Aggregator
|
||||
}
|
||||
|
||||
if timelyQueryForm.ShouldComputeRate {
|
||||
timelyQuery.Rate = true
|
||||
timelyQuery.RateOptions.Counter = timelyQueryForm.IsCounter
|
||||
}
|
||||
|
||||
if len(timelyQueryForm.CounterMax) > 0 {
|
||||
counterMax, error := strconv.ParseInt(timelyQueryForm.CounterMax, 10, 32)
|
||||
if error == nil {
|
||||
timelyQuery.RateOptions.CounterMax = int32(counterMax)
|
||||
}
|
||||
}
|
||||
|
||||
if len(timelyQueryForm.CounterResetValue) > 0 {
|
||||
counterResetValue, error := strconv.ParseInt(timelyQueryForm.CounterResetValue, 10, 32)
|
||||
if error == nil {
|
||||
timelyQuery.RateOptions.ResetValue = int32(counterResetValue)
|
||||
}
|
||||
}
|
||||
|
||||
if !timelyQueryForm.DisableDownsampling {
|
||||
downsampleDuration, error := time.ParseDuration(timelyQueryForm.DownsampleInterval)
|
||||
if error == nil {
|
||||
timelyQuery.Downsample = strconv.FormatInt(downsampleDuration.Milliseconds(), 10) + "ms-" + timelyQueryForm.DownsampleAggregator
|
||||
}
|
||||
|
||||
if len(timelyQueryForm.DownsampleFillPolicy) > 0 && timelyQueryForm.DownsampleFillPolicy != "none" {
|
||||
timelyQuery.Downsample += "-" + timelyQueryForm.DownsampleFillPolicy
|
||||
}
|
||||
}
|
||||
|
||||
return &timelyQuery
|
||||
return datasource.ServeOpts{
|
||||
CheckHealthHandler: ds,
|
||||
CallResourceHandler: ds,
|
||||
QueryDataHandler: ds,
|
||||
}
|
||||
}
|
||||
|
||||
func (dataSource *TimelyDatasource) changedClientSSLSettings(settings TimelyDataSourceOptions) bool {
|
||||
//func (ds *TimelyDatasource) getSettings(pluginContext backend.PluginContext) (*TimelyDatasourceInstanceSettings, error) {
|
||||
// iface, err := ds.im.Get(pluginContext)
|
||||
// if err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
//
|
||||
// return iface.(*TimelyDatasourceInstanceSettings), nil
|
||||
//}
|
||||
|
||||
clientCertificatePath := settings.ClientCertificatePath
|
||||
clientKeyPath := settings.ClientKeyPath
|
||||
certificateAuthorityPath := settings.CertificateAuthorityPath
|
||||
return clientCertificatePath != dataSource.ClientCertificatePath || clientKeyPath != dataSource.ClientKeyPath ||
|
||||
certificateAuthorityPath != dataSource.CertificateAuthorityPath
|
||||
// CheckHealth handles health checks sent from Grafana to the plugin.
|
||||
// The main use case for these health checks is the test button on the
|
||||
// datasource configuration page which allows users to verify that
|
||||
// a datasource is working as expected.
|
||||
func (td *TimelyDatasource) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
|
||||
var status = backend.HealthStatusOk
|
||||
var message = ""
|
||||
|
||||
return &backend.CheckHealthResult{
|
||||
Status: status,
|
||||
Message: message,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (dataSource *TimelyDatasource) GetHttpClient(settings TimelyDataSourceOptions, useClientCertIfAvailable bool) (*http.Client, error) {
|
||||
func (td *TimelyDatasource) CallResource(ctx context.Context, request *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
|
||||
|
||||
// handle call back
|
||||
logger.Debug("Getting client", "allowInsecureSsl", strconv.FormatBool(settings.AllowInsecureSsl))
|
||||
tr := &http.Transport{
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
TLSClientConfig: &tls.Config{
|
||||
InsecureSkipVerify: settings.AllowInsecureSsl,
|
||||
},
|
||||
}
|
||||
httpClient := &http.Client{
|
||||
Transport: tr,
|
||||
}
|
||||
if request.Body == nil {
|
||||
logger.Debug("CallResource", "Path", request.Path, "URL", request.URL)
|
||||
} else {
|
||||
logger.Debug("CallResource", "Path", request.Path, "URL", request.URL, "Body", string(request.Body))
|
||||
}
|
||||
var response backend.CallResourceResponse
|
||||
pluginContext := request.PluginContext
|
||||
var httpResponse *http.Response
|
||||
var timelyDataSourceOptions TimelyDataSourceOptions
|
||||
err := json.Unmarshal(pluginContext.DataSourceInstanceSettings.JSONData, &timelyDataSourceOptions)
|
||||
if err != nil {
|
||||
logger.Error("Error unmarshalling datasource JSONData", "error", err)
|
||||
return err
|
||||
}
|
||||
|
||||
clientCertificatePath := settings.ClientCertificatePath
|
||||
clientKeyPath := settings.ClientKeyPath
|
||||
certificateAuthorityPath := settings.CertificateAuthorityPath
|
||||
httpClient, err := td.GetHttpClient(timelyDataSourceOptions, true)
|
||||
if err != nil {
|
||||
logger.Error("Error getting httpClient", "error", err)
|
||||
return err
|
||||
}
|
||||
|
||||
if dataSource.changedClientSSLSettings(settings) {
|
||||
dataSource.Mutex.Lock()
|
||||
// check again to prevent double initialization
|
||||
if dataSource.changedClientSSLSettings(settings) {
|
||||
// if clientCertificatePath or clientKeyPath changed, then re-read the
|
||||
// client cert into the datasource and also save the new paths
|
||||
if clientCertificatePath != dataSource.ClientCertificatePath || clientKeyPath != dataSource.ClientKeyPath {
|
||||
if clientCertificatePath != "" && clientKeyPath != "" {
|
||||
cert, err := tls.LoadX509KeyPair(clientCertificatePath, clientKeyPath)
|
||||
if err != nil {
|
||||
logger.Error("Failed to setup client certificate", "cert_path", clientCertificatePath, "key_path", clientKeyPath, "error", err)
|
||||
return nil, fmt.Errorf("Failed to setup client certificate")
|
||||
}
|
||||
dataSource.Certificate = &cert
|
||||
logger.Debug("Completed setup of client certificate", "cert_path", clientCertificatePath, "key_path", clientKeyPath)
|
||||
} else {
|
||||
// if one but not both items have been configured
|
||||
if clientCertificatePath != "" || clientKeyPath != "" {
|
||||
logger.Info("Both cert_path and key_path are required. Client connection updated with no client certificate.")
|
||||
}
|
||||
dataSource.Certificate = nil
|
||||
}
|
||||
dataSource.ClientCertificatePath = clientCertificatePath
|
||||
dataSource.ClientKeyPath = clientKeyPath
|
||||
}
|
||||
if strings.HasPrefix(request.Path, "/api/aggregators") ||
|
||||
strings.HasPrefix(request.Path, "/api/suggest") ||
|
||||
strings.HasPrefix(request.Path, "/api/search/lookup") {
|
||||
|
||||
// if certificateAuthorityPath changed, then re-read the
|
||||
// certificate authority into the datasource and also save the new path
|
||||
if certificateAuthorityPath != dataSource.CertificateAuthorityPath {
|
||||
if certificateAuthorityPath != "" {
|
||||
caCert, err := ioutil.ReadFile(certificateAuthorityPath)
|
||||
if err != nil {
|
||||
logger.Error("Failed to setup certificate authority", "ca_path", certificateAuthorityPath, "error", err)
|
||||
return nil, fmt.Errorf("Failed to setup certificate authority")
|
||||
}
|
||||
dataSource.CertPool = x509.NewCertPool()
|
||||
dataSource.CertPool.AppendCertsFromPEM(caCert)
|
||||
logger.Debug("Completed setup of certificate authority", "ca_path", certificateAuthorityPath)
|
||||
} else {
|
||||
logger.Debug("Client connection updated with no certificate authority")
|
||||
dataSource.CertPool = nil
|
||||
}
|
||||
dataSource.CertificateAuthorityPath = certificateAuthorityPath
|
||||
}
|
||||
}
|
||||
dataSource.Mutex.Unlock()
|
||||
}
|
||||
if request.Method == "GET" {
|
||||
var x = strings.Index(request.URL, request.Path)
|
||||
finalParams := ""
|
||||
if x > -1 {
|
||||
params := request.URL[x+len(request.Path) : len(request.URL)]
|
||||
|
||||
// protect against changes in-progress
|
||||
dataSource.Mutex.Lock()
|
||||
if useClientCertIfAvailable && dataSource.Certificate != nil {
|
||||
tr.TLSClientConfig.Certificates = append(tr.TLSClientConfig.Certificates, *dataSource.Certificate)
|
||||
}
|
||||
if dataSource.CertPool != nil {
|
||||
tr.TLSClientConfig.RootCAs = dataSource.CertPool
|
||||
}
|
||||
dataSource.Mutex.Unlock()
|
||||
return httpClient, nil
|
||||
if len(params) > 0 && strings.HasPrefix(params, "?") {
|
||||
finalParams = params
|
||||
}
|
||||
}
|
||||
url, err := url.Parse("https://" + timelyDataSourceOptions.TimelyHost + ":" + timelyDataSourceOptions.HttpsPort + request.Path + finalParams)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
httpResponse, err = httpClient.Get(url.String())
|
||||
} else if request.Method == "POST" {
|
||||
url, err := url.Parse("https://" + timelyDataSourceOptions.TimelyHost + ":" + timelyDataSourceOptions.HttpsPort + request.Path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
httpResponse, err = httpClient.Post(url.String(), "application/json", bytes.NewReader(request.Body))
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
logger.Error("Error calling for resource", "Path", request.Path, "error", err)
|
||||
return err
|
||||
}
|
||||
bytes, err := ioutil.ReadAll(httpResponse.Body)
|
||||
if err != nil {
|
||||
logger.Error("Error reading resource", "Path", request.Path, "error", err)
|
||||
return err
|
||||
}
|
||||
response.Status = 200
|
||||
response.Body = bytes
|
||||
} else {
|
||||
// no matching resource
|
||||
response.Status = 404
|
||||
}
|
||||
sender.Send(&response)
|
||||
return nil
|
||||
}
|
||||
|
||||
// QueryData handles multiple queries and returns multiple responses.
|
||||
// req contains the queries []DataQuery (where each query contains RefID as a unique identifer).
|
||||
// The QueryDataResponse contains a map of RefID to the response for each query, and each response
|
||||
// contains Frames ([]*Frame).
|
||||
func (td *TimelyDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
|
||||
// create response struct
|
||||
response := backend.NewQueryDataResponse()
|
||||
|
||||
// loop over queries and execute them individually.
|
||||
for _, q := range req.Queries {
|
||||
res, error := td.Query(req, q)
|
||||
if error != nil {
|
||||
errorResponse := backend.DataResponse{
|
||||
Error: error,
|
||||
}
|
||||
response.Responses[q.RefID] = errorResponse
|
||||
} else {
|
||||
// save the response in a hashmap
|
||||
// based on with RefID as identifier
|
||||
response.Responses[q.RefID] = *res
|
||||
}
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
func (td *TimelyDatasource) Query(queryDataRequest *backend.QueryDataRequest, dataQuery backend.DataQuery) (*backend.DataResponse, error) {
|
||||
|
||||
timelyRequest := TimelyRequest{
|
||||
MsResolution: true,
|
||||
GlobalAnnotations: true,
|
||||
Start: dataQuery.TimeRange.From.Unix() * 1000,
|
||||
End: dataQuery.TimeRange.To.Unix() * 1000,
|
||||
}
|
||||
|
||||
var timelyQueryForm TimelyQueryForm
|
||||
var timelyQueryServer TimelyQueryServer
|
||||
var err error
|
||||
var isUser bool
|
||||
|
||||
if queryDataRequest.PluginContext.User == nil {
|
||||
isUser = false
|
||||
err = json.Unmarshal(dataQuery.JSON, &timelyQueryServer)
|
||||
if err == nil {
|
||||
timelyQueryForm = TimelyQueryForm{
|
||||
Metric: timelyQueryServer.Metric,
|
||||
Aggregator: timelyQueryServer.Aggregator,
|
||||
DisableDownsampling: timelyQueryServer.DisableDownsampling,
|
||||
DownsampleAggregator: timelyQueryServer.DownsampleAggregator,
|
||||
DownsampleFillPolicy: timelyQueryServer.DownsampleFillPolicy,
|
||||
DownsampleInterval: timelyQueryServer.DownsampleInterval,
|
||||
Tags: timelyQueryServer.Tags,
|
||||
Filters: timelyQueryServer.Filters,
|
||||
ShouldComputeRate: timelyQueryServer.ShouldComputeRate,
|
||||
IsCounter: timelyQueryServer.IsCounter,
|
||||
CounterMax: timelyQueryServer.CounterMax,
|
||||
CounterResetValue: timelyQueryServer.CounterResetValue,
|
||||
Tsuids: timelyQueryServer.Tsuids,
|
||||
QueryType: timelyQueryServer.QueryType,
|
||||
RefId: timelyQueryServer.RefId,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
isUser = true
|
||||
err = json.Unmarshal(dataQuery.JSON, &timelyQueryForm)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
logger.Error("Failed parsing timelyQuery", "error", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
timelyQuery := td.convertTimelyQuery(&timelyQueryForm)
|
||||
timelyRequest.Queries = append(timelyRequest.Queries, *timelyQuery)
|
||||
|
||||
logger.Debug("Query", "timelyRequest", timelyRequest)
|
||||
|
||||
var timelyDatasourceOptions TimelyDataSourceOptions
|
||||
|
||||
err = json.Unmarshal(queryDataRequest.PluginContext.DataSourceInstanceSettings.JSONData, &timelyDatasourceOptions)
|
||||
if err != nil {
|
||||
logger.Error("Error unmarshalling datasource JSONData", "error", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var httpRequest *http.Request
|
||||
httpRequest, err = td.createRequest(timelyDatasourceOptions, timelyRequest)
|
||||
if err != nil {
|
||||
logger.Error("Error creating httpRequest", "error", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
oauthToken, tokenExists := queryDataRequest.Headers["Authorization"]
|
||||
if tokenExists {
|
||||
logger.Debug("Adding Authorization:" + oauthToken)
|
||||
httpRequest.Header.Add("Authorization", oauthToken)
|
||||
}
|
||||
|
||||
var useClientCertIfAvailable = !isUser || (!tokenExists && timelyDatasourceOptions.UseClientCertWhenOAuthMissing)
|
||||
httpClient, err := td.GetHttpClient(timelyDatasourceOptions, useClientCertIfAvailable)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
res, err := httpClient.Do(httpRequest)
|
||||
if err != nil {
|
||||
logger.Error("Error executing query", "error", err)
|
||||
return nil, err
|
||||
}
|
||||
return td.parseResponse(res)
|
||||
}
|
||||
|
||||
func (td *TimelyDatasource) createRequest(tdo TimelyDataSourceOptions, timelyRequest TimelyRequest) (*http.Request, error) {
|
||||
u, err := url.Parse("https://" + tdo.TimelyHost + ":" + tdo.HttpsPort + "/api/query")
|
||||
if err != nil {
|
||||
logger.Error("Failed creating query url", "error", err)
|
||||
return nil, fmt.Errorf("Failed creating query url. error: %v", err)
|
||||
}
|
||||
postData, err := json.Marshal(timelyRequest)
|
||||
if err != nil {
|
||||
logger.Error("Failed marshaling timelyRequest", "error", err)
|
||||
return nil, fmt.Errorf("Failed to create request. error: %v", err)
|
||||
}
|
||||
req, err := http.NewRequest(http.MethodPost, u.String(), bytes.NewReader(postData))
|
||||
if err != nil {
|
||||
logger.Error("Failed to create request", "error", err)
|
||||
return nil, fmt.Errorf("Failed to create request. error: %v", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
||||
requestData, err := json.Marshal(timelyRequest)
|
||||
if err != nil {
|
||||
logger.Error("Failed marshaling request", "error", err)
|
||||
} else {
|
||||
logger.Debug("Created query request: " + string(requestData))
|
||||
}
|
||||
return req, err
|
||||
}
|
||||
|
||||
func (td *TimelyDatasource) parseResponse(res *http.Response) (*backend.DataResponse, error) {
|
||||
|
||||
body, err := ioutil.ReadAll(res.Body)
|
||||
defer res.Body.Close()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if res.StatusCode/100 != 2 {
|
||||
var errorResponse TimelyErrorResponse
|
||||
err = json.Unmarshal(body, &errorResponse)
|
||||
if err != nil {
|
||||
logger.Error("Query failed", "status", res.Status, "body", string(body))
|
||||
return nil, fmt.Errorf("Query failed - %v: %s", res.Status, string(body))
|
||||
}
|
||||
logger.Error("Query failed", "status", res.Status, "message", errorResponse.Message, "detailMessage", errorResponse.DetailMessage)
|
||||
return nil, fmt.Errorf("Query failed - %v [%s] [%s]", res.Status, errorResponse.Message, errorResponse.DetailMessage)
|
||||
}
|
||||
|
||||
var object []TimelyResponse
|
||||
err = json.Unmarshal(body, &object)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Failed to unmarshal Timely response - body: %s status: %v", string(body), res.Status)
|
||||
}
|
||||
|
||||
response := backend.DataResponse{}
|
||||
|
||||
for _, val := range object {
|
||||
var name = val.Metric
|
||||
for k, v := range val.Tags {
|
||||
name = name + " " + k + "=" + v
|
||||
}
|
||||
frame := data.NewFrame(name)
|
||||
timestamps := make([]*time.Time, 0)
|
||||
values := make([]*float64, 0)
|
||||
keys := make([]int64, 0, len(val.DataPoints))
|
||||
for k := range val.DataPoints {
|
||||
keys = append(keys, k)
|
||||
}
|
||||
|
||||
sort.Slice(keys, func(i, j int) bool {
|
||||
return keys[i] < keys[j]
|
||||
})
|
||||
|
||||
for _, timestampInt64 := range keys {
|
||||
value := val.DataPoints[timestampInt64]
|
||||
timestampTime := time.Unix(timestampInt64/1000, 0)
|
||||
timestamps = append(timestamps, ×tampTime)
|
||||
newValue := float64(value)
|
||||
values = append(values, &newValue)
|
||||
}
|
||||
frame.Fields = append(frame.Fields, data.NewField("time", val.Tags, timestamps))
|
||||
frame.Fields = append(frame.Fields, data.NewField(val.Metric, val.Tags, values))
|
||||
response.Frames = append(response.Frames, frame)
|
||||
}
|
||||
// add the frames to the response
|
||||
return &response, nil
|
||||
}
|
||||
|
||||
func (td *TimelyDatasource) convertTimelyQuery(timelyQueryForm *TimelyQueryForm) *TimelyQuery {
|
||||
|
||||
if timelyQueryForm == nil {
|
||||
return nil
|
||||
}
|
||||
timelyQuery := TimelyQuery{
|
||||
Metric: timelyQueryForm.Metric,
|
||||
Aggregator: "none",
|
||||
Rate: false,
|
||||
RateOptions: RateOptions{},
|
||||
Downsample: "60000ms-avg",
|
||||
Tags: timelyQueryForm.Tags,
|
||||
Filters: timelyQueryForm.Filters,
|
||||
Tsuids: timelyQueryForm.Tsuids,
|
||||
}
|
||||
|
||||
// future work - replace scopedVariables in metric, tags, filters, aggregator
|
||||
|
||||
timelyQuery.Aggregator = "avg"
|
||||
|
||||
if timelyQueryForm.Aggregator != "" {
|
||||
timelyQuery.Aggregator = timelyQueryForm.Aggregator
|
||||
}
|
||||
|
||||
if timelyQueryForm.ShouldComputeRate {
|
||||
timelyQuery.Rate = true
|
||||
timelyQuery.RateOptions.Counter = timelyQueryForm.IsCounter
|
||||
}
|
||||
|
||||
if len(timelyQueryForm.CounterMax) > 0 {
|
||||
counterMax, error := strconv.ParseInt(timelyQueryForm.CounterMax, 10, 32)
|
||||
if error == nil {
|
||||
timelyQuery.RateOptions.CounterMax = int32(counterMax)
|
||||
}
|
||||
}
|
||||
|
||||
if len(timelyQueryForm.CounterResetValue) > 0 {
|
||||
counterResetValue, error := strconv.ParseInt(timelyQueryForm.CounterResetValue, 10, 32)
|
||||
if error == nil {
|
||||
timelyQuery.RateOptions.ResetValue = int32(counterResetValue)
|
||||
}
|
||||
}
|
||||
|
||||
if !timelyQueryForm.DisableDownsampling {
|
||||
downsampleDuration, error := time.ParseDuration(timelyQueryForm.DownsampleInterval)
|
||||
if error == nil {
|
||||
timelyQuery.Downsample = strconv.FormatInt(downsampleDuration.Milliseconds(), 10) + "ms-" + timelyQueryForm.DownsampleAggregator
|
||||
}
|
||||
|
||||
if len(timelyQueryForm.DownsampleFillPolicy) > 0 && timelyQueryForm.DownsampleFillPolicy != "none" {
|
||||
timelyQuery.Downsample += "-" + timelyQueryForm.DownsampleFillPolicy
|
||||
}
|
||||
}
|
||||
return &timelyQuery
|
||||
}
|
||||
|
||||
func (td *TimelyDatasource) clientSslSettingsChanged(settings TimelyDataSourceOptions) bool {
|
||||
|
||||
clientCertificatePath := settings.ClientCertificatePath
|
||||
clientKeyPath := settings.ClientKeyPath
|
||||
certificateAuthorityPath := settings.CertificateAuthorityPath
|
||||
return clientCertificatePath != td.ClientCertificatePath || clientKeyPath != td.ClientKeyPath ||
|
||||
certificateAuthorityPath != td.CertificateAuthorityPath
|
||||
}
|
||||
|
||||
func (td *TimelyDatasource) GetHttpClient(settings TimelyDataSourceOptions, useClientCertIfAvailable bool) (*http.Client, error) {
|
||||
|
||||
// handle call back
|
||||
logger.Debug("Getting client", "allowInsecureSsl", strconv.FormatBool(settings.AllowInsecureSsl))
|
||||
tr := &http.Transport{
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
TLSClientConfig: &tls.Config{
|
||||
InsecureSkipVerify: settings.AllowInsecureSsl,
|
||||
},
|
||||
}
|
||||
httpClient := &http.Client{
|
||||
Transport: tr,
|
||||
}
|
||||
|
||||
clientCertificatePath := settings.ClientCertificatePath
|
||||
clientKeyPath := settings.ClientKeyPath
|
||||
certificateAuthorityPath := settings.CertificateAuthorityPath
|
||||
|
||||
if td.clientSslSettingsChanged(settings) {
|
||||
td.Mutex.Lock()
|
||||
// check again to prevent double initialization
|
||||
if td.clientSslSettingsChanged(settings) {
|
||||
// if clientCertificatePath or clientKeyPath changed, then re-read the
|
||||
// client cert into the datasource and also save the new paths
|
||||
if clientCertificatePath != td.ClientCertificatePath || clientKeyPath != td.ClientKeyPath {
|
||||
if clientCertificatePath != "" && clientKeyPath != "" {
|
||||
cert, err := tls.LoadX509KeyPair(clientCertificatePath, clientKeyPath)
|
||||
if err != nil {
|
||||
logger.Error("Failed to setup client certificate", "cert_path", clientCertificatePath, "key_path", clientKeyPath, "error", err)
|
||||
return nil, fmt.Errorf("Failed to setup client certificate")
|
||||
}
|
||||
td.Certificate = &cert
|
||||
logger.Debug("Completed setup of client certificate", "cert_path", clientCertificatePath, "key_path", clientKeyPath)
|
||||
} else {
|
||||
// if one but not both items have been configured
|
||||
if clientCertificatePath != "" || clientKeyPath != "" {
|
||||
logger.Info("Both cert_path and key_path are required. Client connection updated with no client certificate.")
|
||||
}
|
||||
td.Certificate = nil
|
||||
}
|
||||
td.ClientCertificatePath = clientCertificatePath
|
||||
td.ClientKeyPath = clientKeyPath
|
||||
}
|
||||
|
||||
// if certificateAuthorityPath changed, then re-read the
|
||||
// certificate authority into the datasource and also save the new path
|
||||
if certificateAuthorityPath != td.CertificateAuthorityPath {
|
||||
if certificateAuthorityPath != "" {
|
||||
caCert, err := ioutil.ReadFile(certificateAuthorityPath)
|
||||
if err != nil {
|
||||
logger.Error("Failed to setup certificate authority", "ca_path", certificateAuthorityPath, "error", err)
|
||||
return nil, fmt.Errorf("Failed to setup certificate authority")
|
||||
}
|
||||
td.CertPool = x509.NewCertPool()
|
||||
td.CertPool.AppendCertsFromPEM(caCert)
|
||||
logger.Debug("Completed setup of certificate authority", "ca_path", certificateAuthorityPath)
|
||||
} else {
|
||||
logger.Debug("Client connection updated with no certificate authority")
|
||||
td.CertPool = nil
|
||||
}
|
||||
td.CertificateAuthorityPath = certificateAuthorityPath
|
||||
}
|
||||
}
|
||||
td.Mutex.Unlock()
|
||||
}
|
||||
|
||||
// protect against changes in-progress
|
||||
td.Mutex.Lock()
|
||||
if useClientCertIfAvailable && td.Certificate != nil {
|
||||
tr.TLSClientConfig.Certificates = append(tr.TLSClientConfig.Certificates, *td.Certificate)
|
||||
}
|
||||
if td.CertPool != nil {
|
||||
tr.TLSClientConfig.RootCAs = td.CertPool
|
||||
}
|
||||
td.Mutex.Unlock()
|
||||
return httpClient, nil
|
||||
}
|
||||
|
||||
func main() {
|
||||
// Start listening to requests send from Grafana. This call is blocking so
|
||||
// it wont finish until Grafana shutsdown the process or the plugin choose
|
||||
// to exit close down by itself
|
||||
err := datasource.Serve(getServeOpts())
|
||||
|
||||
// Log any error if we could not start the plugin.
|
||||
if err != nil {
|
||||
logger.Error("Plugin failed to start", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
@@ -185,28 +185,6 @@ export class ConfigEditor extends PureComponent<Props, State> {
|
||||
onChange={this.onAllowInsecureSslChange}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="gf-form">
|
||||
<p>
|
||||
<a
|
||||
className="external-link"
|
||||
target="_blank"
|
||||
href=""
|
||||
onClick={() =>
|
||||
window.open(
|
||||
"https://" +
|
||||
jsonData.timelyHost +
|
||||
":" +
|
||||
jsonData.httpsPort +
|
||||
"/version",
|
||||
"_blank"
|
||||
)
|
||||
}
|
||||
>
|
||||
Open a new browser tab/window to test https access
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Timely</name>
|
||||
<description>A secure and scalable time series database based on Apache Accumulo</description>
|
||||
@@ -67,7 +67,7 @@
|
||||
<version.jcip-annotations>1.0</version.jcip-annotations>
|
||||
<version.jjwt>0.11.2</version.jjwt>
|
||||
<version.jsoup>1.11.3</version.jsoup>
|
||||
<version.junit>4.12</version.junit>
|
||||
<version.junit>4.13.1</version.junit>
|
||||
<version.log4j>2.13.3</version.log4j>
|
||||
<version.maven-assembly>3.1.1</version.maven-assembly>
|
||||
<version.maven-build-helper>3.0.0</version.maven-build-helper>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>timely</groupId>
|
||||
<artifactId>timely</artifactId>
|
||||
<version>1.3.1-SNAPSHOT</version>
|
||||
<version>1.3.1</version>
|
||||
</parent>
|
||||
<artifactId>timely-server</artifactId>
|
||||
<dependencies>
|
||||
|
||||
Reference in new issue
Block a user