Skip to content

Commit 9a2b5cb

Browse files
neuralfraudneuralfraud
committed
Version 4.0.3
Fixed query editor element alignment, clean up metadata, remove unused content, revise/fix historic data channel name issues
1 parent 018071d commit 9a2b5cb

22 files changed

+123
-306
lines changed

‎CHANGELOG.md‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,51 @@ As of July, 2017, all significant changes will be logged in this document.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
66

7+
## [4.0.3] - 2017-07-28
8+
9+
### Fixed
10+
11+
- **Query Editor**: Fixed structure of editor elements, alignment and other visual tweaks
12+
- **API**: Fixed an issue with some sensors where the displayed name is different from the name returned by the histdata XML query.
13+
14+
### Added
15+
16+
### Changed
17+
18+
- **Plugin**: Cleaned up package.json and plugin.json, updated version number, updated plugin README.md, removed unused content, and, replaced PRTG logo image.
19+
20+
## [4.0.2] - 2017-07-24
21+
22+
### Fixed
23+
24+
- **API**: Missed a bug that caused the query editor to show ALL sensors when Device was set to "*" even if Group was specified.
25+
- **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)
26+
27+
### Changed
28+
29+
- **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.
30+
- **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.
31+
32+
### Added
33+
34+
- **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)
35+
736
## [4.0.1] - 2017-07-24
837

38+
### Fixed
39+
940
- **Query Editor**: Fixed color highlighting. Addresses [#48](https://github.com/neuralfraud/grafana-prtg/issues/48)
10-
- **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)
11-
- **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)
41+
42+
### Changed
43+
1244
- **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.
1345
- **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.
1446

47+
### Added
48+
49+
- **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)
50+
- **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)
51+
1552
## [4.0.0] - 2017-07-17
1653

1754
### Fixed

‎jasonlashua-prtg-datasource/dist/README.md‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1-
# PRTG Datasource for Grafana 3.x
1+
# PRTG Datasource for Grafana
22

3-
This is a **beta** plugin designed to work with Grafana 3.0 and newer.
3+
[![GitHub version](https://badge.fury.io/gh/neuralfraud%2Fgrafana-prtg.svg)](https://badge.fury.io/gh/neuralfraud%2Fgrafana-prtg)
4+
[![Change Log](https://img.shields.io/badge/change-log-blue.svg?style=flat)](https://github.com/neuralfraud/grafana-prtg/blob/master/CHANGELOG.md)
5+
[![Docs](https://img.shields.io/badge/docs-latest-red.svg?style=flat)](https://github.com/neuralfraud/grafana-prtg/wiki)
6+
[![Donate](https://img.shields.io/badge/donate-paypal-2c9eda.svg?style=flat&colorA=0b3684)](https://paypal.me/jaylashua/10)
47

5-
Please participate on GitHub!
8+
Vizualize your PRTG data with rich, powerful Grafana dashboards!
9+
10+
## Features
11+
12+
- Select multiple metrics in a single query using regular expressions
13+
- Select from an array of PRTG metadata properties, including Status, Message, Active, Tags, Priortiy, and more.
14+
- Query raw JSON direct from the PRTG API and render using the Table panel
15+
- Show sensor status messages on graphs with Annotations
16+
17+
For more information, see [The Grafana-PRTG Wiki](https://github.com/neuralfraud/grafana-prtg/wiki)

‎jasonlashua-prtg-datasource/dist/XMLtoJSON.xsl‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎jasonlashua-prtg-datasource/dist/img/PRTG_logo_lg.png‎

-17.7 KB
Binary file not shown.

‎jasonlashua-prtg-datasource/dist/img/PRTG_logo_sm.png‎

-4.77 KB
Binary file not shown.

‎jasonlashua-prtg-datasource/dist/img/prtglogo.png‎

135 KB
Loading

‎jasonlashua-prtg-datasource/dist/module.js‎

Lines changed: 3 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jasonlashua-prtg-datasource/dist/module.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
</div>
1717
<div class="gf-form-inline" ng-show="ctrl.target.options.mode.name == 'Raw'">
1818
<div class="gf-form max-width-20">
19-
<label class="gf-form-label width-7">URI</label>
19+
<label class="gf-form-label query-keyword width-7">URI</label>
2020
<input type="text"
2121
ng-model="ctrl.target.raw.uri"
2222
ng-blur="ctrl.targetChange()"
2323
class="gf-form-input"
2424
spellcheck="false"
2525
placeholder="getstatus.htm">
2626
</div>
27-
<div class="gf-form max-width-40">
28-
<label class="gf-form-label width-10">Query String</label>
27+
<div class="gf-form">
28+
<label class="gf-form-label query-keyword width-10">Query String</label>
2929
<input type="text"
3030
ng-model="ctrl.target.raw.queryString"
3131
ng-blur="ctrl.targetChange()"
3232
spellcheck=false
33-
class="gf-form-input"
33+
class="gf-form-input width-30"
3434
placeholder="id=0&tabid=1">
3535
</div>
3636
<div class="gf-form gf-form--grow">
@@ -53,7 +53,7 @@
5353
}">
5454
</input>
5555
</div>
56-
<div class="gf-form max-width-40">
56+
<div class="gf-form">
5757
<label class="gf-form-label query-keyword width-7">Host</label>
5858
<input type="text"
5959
ng-model="ctrl.target.device.name"
@@ -75,7 +75,7 @@
7575
</div>
7676

7777
<div class="gf-form-inline" ng-show="ctrl.target.options.mode.name !== 'Raw'">
78-
<div class="gf-form max-width-40">
78+
<div class="gf-form max-width-20">
7979
<label class="gf-form-label query-keyword width-7">Sensor</label>
8080
<input type="text"
8181
ng-model="ctrl.target.sensor.name"
@@ -90,7 +90,7 @@
9090
}">
9191
</input>
9292
</div>
93-
<div class="gf-form max-width-40" ng-show="ctrl.target.options.mode.name == 'Metrics'">
93+
<div class="gf-form" ng-show="ctrl.target.options.mode.name == 'Metrics'">
9494
<label class="gf-form-label query-keyword width-7">Channel</label>
9595
<input type="text"
9696
ng-model="ctrl.target.channel.name"
@@ -117,7 +117,7 @@
117117
<label class="gf-form-label query-keyword width-7">Options</label>
118118
</div>
119119
<div class="gf-form max-width-40" ng-show="ctrl.target.options.mode.name == 'Metrics'">
120-
<label class="gf-form-label query-keyword width-10">Filter Property</label>
120+
<label class="gf-form-label width-10">Filter Property</label>
121121
<select
122122
ng-model="ctrl.target.options.filterProperty"
123123
ng-change="ctrl.targetChange()"
@@ -130,7 +130,7 @@
130130
</select>
131131
</div>
132132
<div class="gf-form max-width-20" ng-show="ctrl.target.options.mode.name == 'Text'">
133-
<label class="gf-form-label query-keyword width-7">Value From</label>
133+
<label class="gf-form-label width-7">Value From</label>
134134
<select
135135
ng-model="ctrl.target.options.textValueFrom"
136136
ng-change="ctrl.targetChange()"
@@ -143,7 +143,7 @@
143143
</select>
144144
</div>
145145
<div class="gf-form max-width-20" ng-show="ctrl.target.options.mode.name == 'Text'">
146-
<label class="gf-form-label query-keyword width-7">Property</label>
146+
<label class="gf-form-label width-7">Property</label>
147147
<select
148148
ng-model="ctrl.target.options.textProperty"
149149
ng-change="ctrl.targetChange()"
@@ -158,7 +158,7 @@
158158
<div class="gf-form-inline">
159159
<!-- Text metric regex -->
160160
<div class="gf-form max-width-20">
161-
<label class="gf-form-label query-keyword width-7">Text filter</label>
161+
<label class="gf-form-label width-7">Text filter</label>
162162
<input type="text"
163163
class="gf-form-input"
164164
ng-model="ctrl.target.options.textFilter"

‎jasonlashua-prtg-datasource/dist/partials/query.options.html‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)