diff options
author | Pim van den Berg | 2012-12-16 13:35:43 +0100 |
---|---|---|
committer | Pim van den Berg | 2012-12-16 13:35:43 +0100 |
commit | d8dd1c7c0b84eb30a02fc07f1df5f5f2ab6fb8a3 (patch) | |
tree | 46568f3bc6e65b09b3b299f38f5331ce1f82cefe /type/Default.class.php | |
parent | type: add debug option "cmd" create a commandline rrdtool command (diff) | |
download | apt-panopticon_cgp-d8dd1c7c0b84eb30a02fc07f1df5f5f2ab6fb8a3.zip apt-panopticon_cgp-d8dd1c7c0b84eb30a02fc07f1df5f5f2ab6fb8a3.tar.gz apt-panopticon_cgp-d8dd1c7c0b84eb30a02fc07f1df5f5f2ab6fb8a3.tar.bz2 apt-panopticon_cgp-d8dd1c7c0b84eb30a02fc07f1df5f5f2ab6fb8a3.tar.xz |
type: escape colons in legend names
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]
Diffstat (limited to 'type/Default.class.php')
-rw-r--r-- | type/Default.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/type/Default.class.php b/type/Default.class.php index fd562b4..13e45c9 100644 --- a/type/Default.class.php +++ b/type/Default.class.php | |||
@@ -287,7 +287,7 @@ class Type_Default { | |||
287 | foreach ($sources as $source) { | 287 | foreach ($sources as $source) { |
288 | $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source; | 288 | $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source; |
289 | $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]): $this->colors; | 289 | $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]): $this->colors; |
290 | $rrdgraph[] = sprintf('LINE1:avg_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($color), $dsname); | 290 | $rrdgraph[] = sprintf('LINE1:avg_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname)); |
291 | $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', crc32hex($source), $this->rrd_format); | 291 | $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', crc32hex($source), $this->rrd_format); |
292 | $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', crc32hex($source), $this->rrd_format); | 292 | $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', crc32hex($source), $this->rrd_format); |
293 | $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', crc32hex($source), $this->rrd_format); | 293 | $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', crc32hex($source), $this->rrd_format); |