|
From: <ha...@us...> - 2015-01-04 20:48:10
|
Revision: 2308
http://sourceforge.net/p/openautomation/code/2308
Author: hausl
Date: 2015-01-04 20:48:09 +0000 (Sun, 04 Jan 2015)
Log Message:
-----------
diagram plugin: add attribute "resolution" to rrd definitions to allow custom resolution values
Modified Paths:
--------------
CometVisu/trunk/src/cometvisu.appcache
CometVisu/trunk/src/plugins/diagram/structure_plugin.js
CometVisu/trunk/src/visu_config.xsd
Property Changed:
----------------
CometVisu/trunk/
Index: CometVisu/trunk
===================================================================
--- CometVisu/trunk 2015-01-03 23:14:21 UTC (rev 2307)
+++ CometVisu/trunk 2015-01-04 20:48:09 UTC (rev 2308)
Property changes on: CometVisu/trunk
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,4 ##
release
docs
+
+.project
Modified: CometVisu/trunk/src/cometvisu.appcache
===================================================================
--- CometVisu/trunk/src/cometvisu.appcache 2015-01-03 23:14:21 UTC (rev 2307)
+++ CometVisu/trunk/src/cometvisu.appcache 2015-01-04 20:48:09 UTC (rev 2308)
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# Version SVN:20141231-1532
+# Version SVN:20150104-2130
CACHE:
index.html
Modified: CometVisu/trunk/src/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/src/plugins/diagram/structure_plugin.js 2015-01-03 23:14:21 UTC (rev 2307)
+++ CometVisu/trunk/src/plugins/diagram/structure_plugin.js 2015-01-04 20:48:09 UTC (rev 2308)
@@ -205,7 +205,8 @@
fill : (this.getAttribute("fill") || "false") == "true",
scaling : parseFloat(this.getAttribute('scaling')) || 1.,
dsIndex : this.getAttribute('datasourceIndex') || 0,
- cFunc : this.getAttribute('consolidationFunction') || "AVERAGE"
+ cFunc : this.getAttribute('consolidationFunction') || "AVERAGE",
+ resol : parseInt(this.getAttribute('resolution')),
};
if (retVal.rrd[retVal.rrdnum].dsIndex < 0) {
retVal.rrd[retVal.rrdnum].dsIndex = 0;
@@ -367,7 +368,7 @@
// get all rrd data
$.each(config.content.rrd, function(index, rrd) {
$.ajax({
- url: templateEngine.visu.urlPrefix+"rrdfetch?rrd=" + rrd.src + ".rrd&ds=" + rrd.cFunc + "&start=" + series.start + "&end=" + series.end + "&res=" + series.res,
+ url: templateEngine.visu.urlPrefix+"rrdfetch?rrd=" + rrd.src + ".rrd&ds=" + rrd.cFunc + "&start=" + series.start + "&end=" + series.end + "&res=" + (rrd.resol ? rrd.resol : series.res),
dataType: "json",
type: "GET",
context: this,
Modified: CometVisu/trunk/src/visu_config.xsd
===================================================================
--- CometVisu/trunk/src/visu_config.xsd 2015-01-03 23:14:21 UTC (rev 2307)
+++ CometVisu/trunk/src/visu_config.xsd 2015-01-04 20:48:09 UTC (rev 2308)
@@ -1268,6 +1268,12 @@
<xsd:documentation xml:lang="de">Auswählen einer der verfügbaren Consolidation Functions des RRDTools (http://rrdtool.org).</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="resolution" type="xsd:integer" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">The standard resolution for retrieving data from the RRD file can be overriden with a custom value in seconds.</xsd:documentation>
+ <xsd:documentation xml:lang="de">Die Standard-Auflösung für die Daten aus der RRD-Datei kann überschrieben werden mit einem eigenen Sekunden-Wert.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|