diff options
| author | Pim van den Berg | 2014-07-16 23:35:23 +0200 |
|---|---|---|
| committer | Pim van den Berg | 2014-07-16 23:37:24 +0200 |
| commit | 5c090c0f64b290960c99b18ce28f3d2fda0e3391 (patch) | |
| tree | edceb258e03c3e7f66dba9fffc0a3093a5b7a4df /graph.php | |
| parent | type/default: optionally draw min/max spikes in a lighter color in graphs (diff) | |
| download | apt-panopticon_cgp-5c090c0f64b290960c99b18ce28f3d2fda0e3391.zip apt-panopticon_cgp-5c090c0f64b290960c99b18ce28f3d2fda0e3391.tar.gz apt-panopticon_cgp-5c090c0f64b290960c99b18ce28f3d2fda0e3391.tar.bz2 apt-panopticon_cgp-5c090c0f64b290960c99b18ce28f3d2fda0e3391.tar.xz | |
graph: don't overwrite config rrdtool_opts by rrdtool_opts from json plugin
Closes #86
Diffstat (limited to 'graph.php')
| -rw-r--r-- | graph.php | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -86,7 +86,7 @@ if (isset($plugin_json[$type]['vertical'])) { | |||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | if (isset($plugin_json[$type]['rrdtool_opts'])) { | 88 | if (isset($plugin_json[$type]['rrdtool_opts'])) { |
| 89 | $obj->rrdtool_opts = $plugin_json[$type]['rrdtool_opts']; | 89 | $obj->rrdtool_opts[] = $plugin_json[$type]['rrdtool_opts']; |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | if (isset($plugin_json[$type]['datasize']) and $plugin_json[$type]['datasize']) | 92 | if (isset($plugin_json[$type]['datasize']) and $plugin_json[$type]['datasize']) |