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

CHANGELOG.md

@@ -4,14 +4,51 @@ 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/).
 
+## [4.0.3] - 2017-07-28
+
+### Fixed
+
+- **Query Editor**: Fixed structure of editor elements, alignment and other visual tweaks
+- **API**: Fixed an issue with some sensors where the displayed name is different from the name returned by the histdata XML query. 
+
+### Added
+
+### Changed
+
+- **Plugin**: Cleaned up package.json and plugin.json, updated version number, updated plugin README.md, removed unused content, and, replaced PRTG logo image.
+
+## [4.0.2] - 2017-07-24
+
+### Fixed
+
+- **API**: Missed a bug that caused the query editor to show ALL sensors when Device was set to "*" even if Group was specified. 
+- **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)
+
+### Changed
+
+- **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. 
+
+### Added
+
+- **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)
+
 ## [4.0.1] - 2017-07-24
 
+### Fixed
+
 - **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)
+
+### Changed
+
 - **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. 
 
+### Added
+
+- **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)
+
 ## [4.0.0] - 2017-07-17
 
 ### Fixed

jasonlashua-prtg-datasource/dist/README.md

@@ -1,5 +1,17 @@
-# PRTG Datasource for Grafana 3.x
+# PRTG Datasource for Grafana
 
-This is a **beta** plugin designed to work with Grafana 3.0 and newer.
+[![GitHub version](https://badge.fury.io/gh/neuralfraud%2Fgrafana-prtg.svg)](https://badge.fury.io/gh/neuralfraud%2Fgrafana-prtg)
+[![Change Log](https://img.shields.io/badge/change-log-blue.svg?style=flat)](https://github.com/neuralfraud/grafana-prtg/blob/master/CHANGELOG.md)
+[![Docs](https://img.shields.io/badge/docs-latest-red.svg?style=flat)](https://github.com/neuralfraud/grafana-prtg/wiki)
+[![Donate](https://img.shields.io/badge/donate-paypal-2c9eda.svg?style=flat&colorA=0b3684)](https://paypal.me/jaylashua/10)
 
-Please participate on GitHub!
+Vizualize your PRTG data with rich, powerful Grafana dashboards!
+
+## Features
+
+- Select multiple metrics in a single query using regular expressions
+- Select from an array of PRTG metadata properties, including Status, Message, Active, Tags, Priortiy, and more.
+- Query raw JSON direct from the PRTG API and render using the Table panel
+- Show sensor status messages on graphs with Annotations
+
+For more information, see [The Grafana-PRTG Wiki](https://github.com/neuralfraud/grafana-prtg/wiki)

jasonlashua-prtg-datasource/dist/partials/query.editor.html

@@ -16,21 +16,21 @@
 	</div>
 	<div class="gf-form-inline" ng-show="ctrl.target.options.mode.name == 'Raw'">
 		<div class="gf-form max-width-20">
-			<label class="gf-form-label width-7">URI</label>
+			<label class="gf-form-label query-keyword width-7">URI</label>
 			<input type="text"
 				   ng-model="ctrl.target.raw.uri"
 				   ng-blur="ctrl.targetChange()"
 				   class="gf-form-input"
 				   spellcheck="false"
 				   placeholder="getstatus.htm">
 		</div>
-		<div class="gf-form max-width-40">
-			<label class="gf-form-label width-10">Query String</label>
+		<div class="gf-form">
+			<label class="gf-form-label query-keyword width-10">Query String</label>
 			<input type="text"
 				   ng-model="ctrl.target.raw.queryString"
 				   ng-blur="ctrl.targetChange()"
 				   spellcheck=false
-				   class="gf-form-input"
+				   class="gf-form-input width-30"
 				   placeholder="id=0&tabid=1">
 		</div>
 		<div class="gf-form gf-form--grow">
@@ -53,7 +53,7 @@
 			}">
 			</input>
 		</div>
-		<div class="gf-form max-width-40">
+		<div class="gf-form">
 			<label class="gf-form-label query-keyword width-7">Host</label>
 			<input type="text"
 			ng-model="ctrl.target.device.name"
@@ -75,7 +75,7 @@
 	</div>
 
 	<div class="gf-form-inline" ng-show="ctrl.target.options.mode.name !== 'Raw'">
-		<div class="gf-form max-width-40">
+		<div class="gf-form max-width-20">
 			<label class="gf-form-label query-keyword width-7">Sensor</label>
 			<input type="text"
 			ng-model="ctrl.target.sensor.name"
@@ -90,7 +90,7 @@
 	        }">
 			</input>
 		</div>
-		<div class="gf-form max-width-40" ng-show="ctrl.target.options.mode.name == 'Metrics'">
+		<div class="gf-form" ng-show="ctrl.target.options.mode.name == 'Metrics'">
 			<label class="gf-form-label query-keyword width-7">Channel</label>
 			<input type="text"
 			ng-model="ctrl.target.channel.name"
@@ -117,7 +117,7 @@
 			<label class="gf-form-label query-keyword width-7">Options</label>
 		</div>
 			<div class="gf-form max-width-40" ng-show="ctrl.target.options.mode.name == 'Metrics'">
-			<label class="gf-form-label query-keyword width-10">Filter Property</label>
+			<label class="gf-form-label width-10">Filter Property</label>
 			<select
 				   ng-model="ctrl.target.options.filterProperty"
 				   ng-change="ctrl.targetChange()"
@@ -130,7 +130,7 @@
 			</select>
 		</div>
 		<div class="gf-form max-width-20" ng-show="ctrl.target.options.mode.name == 'Text'">
-			<label class="gf-form-label query-keyword width-7">Value From</label>
+			<label class="gf-form-label width-7">Value From</label>
 			<select
 				   ng-model="ctrl.target.options.textValueFrom"
 				   ng-change="ctrl.targetChange()"
@@ -143,7 +143,7 @@
 			</select>
 		</div>
 		<div class="gf-form max-width-20" ng-show="ctrl.target.options.mode.name == 'Text'">
-			<label class="gf-form-label query-keyword width-7">Property</label>
+			<label class="gf-form-label width-7">Property</label>
 			<select
 				   ng-model="ctrl.target.options.textProperty"
 				   ng-change="ctrl.targetChange()"
@@ -158,7 +158,7 @@
 		<div class="gf-form-inline">
 		<!-- Text metric regex -->
 			<div class="gf-form max-width-20">
-				<label class="gf-form-label query-keyword width-7">Text filter</label>
+				<label class="gf-form-label width-7">Text filter</label>
 				<input type="text"
 					class="gf-form-input"
 					ng-model="ctrl.target.options.textFilter"

jasonlashua-prtg-datasource/dist/plugin.json

@@ -2,11 +2,9 @@
   "type": "datasource",
   "name": "PRTG",
   "id": "jasonlashua-prtg-datasource",
-
   "metrics": true,
-  "alerting":true,
+  "alerting": true,
   "annotations": true,
-
   "info": {
     "description": "PRTG Datasource plugin for Grafana",
     "author": {
@@ -18,9 +16,12 @@
       "large": "img/prtglogo.png"
     },
     "links": [
-      {"name": "GitHub", "url": "https://github.com/neuralfraud/grafana-prtg"}
+      {
+        "name": "GitHub",
+        "url": "https://github.com/neuralfraud/grafana-prtg"
+      }
     ],
-    "version": "4.0.0",
-    "updated": "2017-07-17"
+    "version": "4.0.3",
+    "updated": "2017-07-28"
   }
-}
+}

jasonlashua-prtg-datasource/gruntfile.js

@@ -4,6 +4,7 @@ module.exports = function(grunt) {
 
   grunt.loadNpmTasks('grunt-execute');
   grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-build-number');
 
   grunt.initConfig({