| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, a command is built by string concatenation. Here, the
distinction between a value and multiple params got lost. Solve this
by using an array for shell arguments. As the escaping is now removed
from the `rrd_gen_graph` function, the canvas style needs to manually
add those quotes to make the JS code still work. That only supports
double-quotes, so hopefully nobody creates a name with a double quote
as that would break the fragile JS command line parser.
Separate the rrdtool options from the rrdtool graph command to make the
`$graph_type == 'canvas'` option work (it would otherwise not understand
the `rrdtool graph - -a PNG` option).
Merge the SVG and PNG cases as they are the same except for the
Content-Type header.
Fix a missing html escape in a debug style.
|
|
|
|
| |
Closes #73
|
|
|
|
| |
This had nothing to do with an RRD data source.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
| |
The IPMI collectd plugin uses parentheses in filenames (`fanspeed-FAN 1 fan_cooling (29.1).rrd`), so we need to escape them before passing them to rrdtool.
|
|
|
|
|
|
|
|
|
|
| |
From the docs:
"No warning is generated if the variable does not exist. That means empty() is
essentially the concise equivalent to !isset($var) || $var == false."
This reverts commit f2a4593558b3a3ec696e9cc1de93fa898b9521bb.
Reported-By: Benoit Monin (https://github.com/pommi/CGP/commit/f2a4593)
|
| |
|
|
|
|
|
| |
Fix php notices emitted when generating graphs of ping, sensors and
hddtemp plugins.
|
| |
|
|
|
|
|
|
|
|
|
| |
Since commit v0.3-97-g5793a8c [integrate jsrrdgraph in CGP], double quotes have
been removed around filenames and legend because it shouldn't be necessary (and
jsrrdgraph didn't support it).
This broke graphs rendered using jsrrdgraph with files including spaces in it's
name. Hopefully this is fixed now by rawurlencoding them (but the /).
|
|
|
|
|
|
|
|
|
|
|
| |
Since commit v0.3-97-g5793a8c [integrate jsrrdgraph in CGP], double quotes have
been removed around filenames and legend because it shouldn't be necessary (and
jsrrdgraph didn't support it).
This broke graphs rendered by rrdtool with files including a colon in it's
name. Hopefully this is fixed now by double escaping them.
Reported-by: Poil <poil@quake.fr> (https://github.com/pommi/CGP/issues/20)
|
|
|
|
| |
It caused an "Unknown argument: undefined" error when using canvas.
|
|
|
|
| |
Use $_SERVER['PATH_INFO'] instead.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Reference: http://rrdtool.mirror.graemef.net/doc/rrdfetch.en.html#IAT_STYLE_TIME_SPECIFICATION
|
|
|
|
| |
Reported-by: Philipp Hellmich <Philipp.Hellmich@Bertelsmann.de>
|
|
|
|
| |
Reported-by: Philipp Hellmich <Philipp.Hellmich@Bertelsmann.de>
|
|
|
|
|
|
|
| |
This problem showed up with IPv6 addresses in the NTP plugin.
Forgotten in commit:
v0.3-51-g330c94f [type: escape colons in filenames used in rrd commandline]
|
| |
|
|
|
|
| |
this should keep the error.log clean
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since commit collectd-4.10.0-88-g02e12db the varnish plugin groups collected
values in categories. The collectd filestructure used for varnish is now:
<plugin>-<category>-<plugin_instance>/<type>-<type_instance>
Because this isn't distinguishable from a regular plugin like df, ...
df-var-tmp/df_complex-free.rrd ("var" isn't the category here)
... the category is only set with the varnish plugin.
Reported-by: Jonathan Huot <jonathan.huot@gmail.com>
|
| |
|
|
|
|
|
|
|
| |
A colon ':' in a legend argument will mark the end of the legend:
http://oss.oetiker.ch/rrdtool/doc/rrdgraph_graph.en.html#INOTES_on_legend_arguments
Reported-by: Benjamin Dupuis <poil@quake.fr>
|
|
|
|
| |
Use 'value' instead.
|
|
|
|
| |
Including a lot of undefined $_GET values.
|
| |
|
|
|
|
| |
When no colors are defined they will be generated by function rainbow_colors.
|
|
|
|
|
| |
Function fill_ds_names is renamed to parse_ds_names and now also
appends spaces to ds_names to make them equal of lenght.
|
|
|
|
| |
instance
|
|
|
|
|
|
|
| |
Like mentioned in the comment on the website below, I think there is no
problem a source contains dots. For now, this line is removed.
http://pommi.nethuis.nl/2010/01/collectd-graph-panel-v0-2/#comment-177
|
|
|
|
|
|
|
|
|
| |
Since I'm using a non standard installation of rrdtool, I always
have to define the --font options when colling the rrdtool binary.
I tried to implement this change in a general way to define locally
rrdtool options in the config.local.php.
Signed-off-by: Edmondo Tommasina <edmondo@eriadon.com>
|
|
|
|
|
|
| |
Since commit 95c70c919 [rewrite of type classes] cpu graphs of hosts running
a 2.4 Linux kernel or Solaris were not displayed. Function rrd_get_sources
must return an array with a consecutive index of numbers.
|
|
|
|
|
|
|
| |
The identifier is needed to send the FLUSH command to the UnixSock plugin.
Partly revert of commit:
596dd7d41 [make rrdfiles using utf8 and spaces work]
|
| |
|
| |
|
| |
|
| |
|