Merge remote-tracking branch 'refs/remotes/origin/Development'

Author: neuralfraud

CHANGELOG.md

@@ -4,7 +4,13 @@ As of July, 2017, all significant changes will be logged in this document.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased]
+## [4.0.1] - 2017-07-24
+
+- **Query Editor**: Fixed color highlighting. Addresses [#48](https://github.com/neuralfraud/grafana-prtg/issues/48)
+- **Query Editor**: Added option to include a device's name in an item's label. Addresses [#47](https://github.com/neuralfraud/grafana-prtg/issues/47)
+- **API**: Added query string parameter "&count=9999" to group, device, and sensor queries to resolve issues for larger deployments. Addresses [#49](https://github.com/neuralfraud/grafana-prtg/issues/49)
+- **API**: Updated method to retrieve historic data, fixes an issue where no values are returned if the channel display name differes from the name in the API XML response. For instance, SSL Security sensors display the channel "Security Rating", when the actual value contains additional descriptive text. 
+- **API**: Performance improvements in the collection of historic data, the array index to retrieve the channel value from is determined using the first result record instead of being determined for each result, which has a noticable impact with multiple-channel queries and thousands of data points. 
 
 ## [4.0.0] - 2017-07-17
 

jasonlashua-prtg-datasource/dist/PRTGAPIService.js

@@ -174,13 +174,19 @@
 		<div class="gf-form-inline" ng-show="ctrl.target.options.mode.name == 'Metrics'">
 		  <gf-form-switch class="gf-form" label="Include Sensor Name"
 			checked="ctrl.target.options.includeSensorName"
-			on-change="ctrl.onQueryOptionChange()">
+			on-change="ctrl.targetChange()">
+		  </gf-form-switch>
+		</div>
+		<div class="gf-form-inline" ng-show="ctrl.target.options.mode.name == 'Metrics'">
+		  <gf-form-switch class="gf-form" label="Include Device Name"
+			checked="ctrl.target.options.includeDeviceName"
+			on-change="ctrl.targetChange()">
 		  </gf-form-switch>
 		</div>
 		<div class="gf-form-inline" ng-show="ctrl.target.options.mode.name == 'Metrics'">
 		  <gf-form-switch class="gf-form" label="Invert Channel Filter"
 			checked="ctrl.target.options.invertChannelFilter"
-			on-change="ctrl.onQueryOptionChange()">
+			on-change="ctrl.targetChange()">
 		  </gf-form-switch>
 		</div>		<div class="gf-form gf-form--grow">
 			<div class="gf-form-label gf-form-label--grow"></div>