Merge pull request #35 from ExpediaInceCommercePlatform/2.0.2

2.0.2 release

Author: baumandm

.editorconfig

@@ -0,0 +1,19 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+indent_size = 4
+max_line_length = off
+trim_trailing_whitespace = false
+
+[*.json]
+indent_size = 2
+max_line_length = off
+trim_trailing_whitespace = false

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 2.0.2
+
+## Bug Fixes
+
+ - Elasticsearch Data Source: Removed unneeded `"json": true` option breaking requests
+
+# 2.0.1
+
+## Features
+
+ - InfluxDB Data Source: Added additional properties for controlling the HTTP(S) request that gets generated.  `options` gives full control of the request, while `insecureSsl` is a boolean shortcut for ignoring SSL validation
+
+ - Elasticsearch Data Source: Added undocumented `options` property
+
 # 2.0.0
 
 ## Features
@@ -133,7 +147,7 @@
  - CloudWatch Data Source: Added new Data Source for retrieving data from Amazon CloudWatch
 
  - JSON Data Source: Added options for AWS signing, allowing use with AWS APIs that require Signature Version 4
- 
+
  - SSL/TLS: Proxy server initializes itself with a list of trusted root CAs.  Added server option for manually providing CAs to trust when executing HTTPS requests
 
  - Highcharts upgraded to 4.2.7
@@ -271,7 +285,7 @@
 ## Features
 
  - Table Widget: Added optional pagination--can automatically or manually specify the number of rows displayed per page. Improves performance when displaying large Data Sources.
- 
+
  - Number Widget: Added Click event handler: can provide a JavaScript function that gets executed when the Number is clicked.
 
  - Dashboard Controls: Added an option to disable the UI controls completely
@@ -313,7 +327,7 @@
 ## Features
 
  - Persistent Parameters: added an option to persist the value of a parameter in the browser's storage. Any value changes are persisted automatically, and will be restored the next time the user opens the Dashboard
- 
+
  - Search: added sort parameters to URL, paging for results
 
  - Browse Dashboards: added a new link to see the top liked dashboards; new search filter "is:liked"

cyclotron-site/app/scripts/common/services/services.commonConfigService.coffee

@@ -39,7 +39,7 @@ cyclotronServices.factory 'commonConfigService', ->
 
     exports = {
 
-        version: '2.0.1'
+        version: '2.0.2'
 
         logging:
             enableDebug: false

cyclotron-site/app/scripts/dashboards/dataSources/dataSources.elasticsearch.coffee

@@ -2,16 +2,16 @@
 # Copyright (c) 2016-2018 the original author or authors.
 #
 # Licensed under the MIT License (the "License");
-# you may not use this file except in compliance with the License. 
+# you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.opensource.org/licenses/mit-license.php
 #
-# Unless required by applicable law or agreed to in writing, 
-# software distributed under the License is distributed on an 
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
-# either express or implied. See the License for the specific 
-# language governing permissions and limitations under the License. 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
 ###
 
 #
@@ -20,7 +20,7 @@
 # Queries the Elasticsearch API.
 # Implements a limited but useful subset of functionality and attempts to parse the results into Cyclotron's format.
 # For more control, the JSON Data Source should be used directly.
-# 
+#
 # Always proxies requests through the Cyclotron service.
 #
 cyclotronDataSources.factory 'elasticsearchDataSource', ($q, $http, configService, dataSourceFactory, logService) ->
@@ -36,9 +36,8 @@ cyclotronDataSources.factory 'elasticsearchDataSource', ($q, $http, configServic
         proxyBody =
             url: url.toString()
             method: 'POST'
-            json: true
             body: options.request
-            headers: 
+            headers:
                 'Content-Type': 'application/json'
 
         if options.options?
@@ -97,7 +96,7 @@ cyclotronDataSources.factory 'elasticsearchDataSource', ($q, $http, configServic
         if responseAdapter == 'auto'
             if response.aggregations?
                 responseAdapter = 'aggregations'
-            else 
+            else
                 responseAdapter = 'hits'
 
         # Convert the Elasticsearch result based on the selected adapter
@@ -132,7 +131,7 @@ cyclotronDataSources.factory 'elasticsearchDataSource', ($q, $http, configServic
                         data = _.map result.body.responses, (response) ->
                             processResponse response, responseAdapter, reject
                         data = _.flatten data
-                    else 
+                    else
                         data = processResponse result.body, responseAdapter, reject
 
                     if _.isNull data
@@ -159,7 +158,7 @@ cyclotronDataSources.factory 'elasticsearchDataSource', ($q, $http, configServic
 
             # Do the request, wiring up success/failure handlers
             req = $http.post proxyUri, getProxyRequest(options)
-            
+
             # Add callback handlers to promise
             req.success successCallback
             req.error errorCallback

cyclotron-site/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "cyclotron-site",
   "description": "Cyclotron: website",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "Dave Bauman <dbauman@expedia.com>",
   "license": "MIT",
   "private": true,

cyclotron-site/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cyclotron-svc",
   "description": "Cyclotron: REST API",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "Dave Bauman <dbauman@expedia.com>",
   "license": "MIT",
   "private": true,
@@ -19,7 +19,7 @@
     "start": "node app.js"
   },
   "dependencies": {
-    "aws4": "^1.3.2",
+    "aws4": "^1.8.0",
     "bluebird": "2.3.6",
     "body-parser": "^1.18.3",
     "compression": "^1.7.3",