Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Defensive programming: more urlencode/htmlentities | Peter Wu | 2014-07-20 | 4 | -52/+61 | |
| | | | | | | | | | | | | | | | | | | Make build_url return an URL, not HTML. This separates presentation from data. plugin_header's return value is unused, remove the unnecessary return. At places where `printf("<tag att='%s'>", $x);` is used, it is now converted to `printf("<tag att=\"%s\">", htmlentities($x));` since the single quote is not escaped by default by htmlentities. In case the canvas style is used, JS should use `textContent` instead of `innerHTML` to avoid reading `"` instead of `"`. Nobody (should) use(s) IE6 anymore, so it is a safe change. While at it, use the standard charset attribute of meta to specify the character set (UTF-8). | |||||
* | graph: don't overwrite config rrdtool_opts by rrdtool_opts from json plugin | Pim van den Berg | 2014-07-16 | 2 | -5/+7 | |
| | | | | Closes #86 | |||||
* | type/default: optionally draw min/max spikes in a lighter color in graphs | Pim van den Berg | 2014-07-05 | 3 | -4/+8 | |
| | | | | Closes #73 | |||||
* | jsrrdgraph: RrdGraph.js: make HRULE support reference to variable | Pim van den Berg | 2014-07-05 | 1 | -1/+3 | |
| | | | | | | The value of HRULE could be a reference to for example a VDEF variable. Closes #85 | |||||
* | type/genericio: apply percentile on scaled value | Pim van den Berg | 2014-07-05 | 1 | -1/+1 | |
| | ||||||
* | Escape HTML in GET-provided hostname | Nicolas Iooss | 2014-06-30 | 2 | -4/+4 | |
| | | | | | | | A malicious user can enter javascript code in "h" GET parameter and this code gets executed because this parameter is copied in the HTML output without any escaping. This patch escape the output before it is checked it is valid. | |||||
* | jsrrdgraph: Fix graph width to look like rrdtool. | Manuel Luis Sanmartín Rozada | 2014-06-28 | 1 | -2/+1 | |
| | ||||||
* | jsrrdgraph: Fix errors in second axis. | Manuel Luis Sanmartín Rozada | 2014-06-28 | 1 | -2/+2 | |
| | ||||||
* | rm plugin.php | Pim van den Berg | 2014-06-28 | 1 | -17/+0 | |
| | | | | | Forgotten in commit: v0.3-77-gbf56a64 [remove ajax js code] | |||||
* | Merge remote-tracking branch 'feandil/time_range' | Pim van den Berg | 2014-06-28 | 1 | -0/+1 | |
|\ | ||||||
| * | Use config time_range for canvas graphs | Vincent Brillault | 2014-06-28 | 1 | -0/+1 | |
| | | ||||||
* | | Keep the list of plugins sorted | Vincent Brillault | 2014-06-28 | 1 | -0/+1 | |
|/ | ||||||
* | type/base: replace array_merge by + sign to merge a fallback array | Pim van den Berg | 2014-06-28 | 1 | -2/+2 | |
| | | | | | | | array_merge resets the index, while in case of $this->colors and $this->legend, we'd like to keep the index. An irq plugin sample: array(1 => 1, 'ERR' => 'ERR') must not become array(0 => 1, 'ERR' => 'ERR') after an array_merge. | |||||
* | Merge remote-tracking branch 'dhchen/master' | Pim van den Berg | 2014-06-24 | 2 | -17/+24 | |
|\ | ||||||
| * | Add support for multiple types db | Dao-hui Chen | 2014-06-11 | 2 | -17/+24 | |
| | | ||||||
* | | Merge remote-tracking branch 'feandil/for_upstream_lvm' | Pim van den Berg | 2014-06-24 | 1 | -0/+15 | |
|\ \ | ||||||
| * | | Add LVM plugin | Vincent Brillault | 2014-06-23 | 1 | -0/+15 | |
| |/ | ||||||
* | | add percentile support to network traffic graphs | Pim van den Berg | 2014-06-24 | 4 | -0/+19 | |
|/ | | | | | | | Set $CONFIG['percentile'] to a number and a XXth percentile line + legend will be added to all network traffic (if_octets) graphs. Closes #81 | |||||
* | plugin/tcpconns: fix missing port number in rrd title | Pim van den Berg | 2014-06-04 | 1 | -1/+1 | |
| | | | | Closes #78 | |||||
* | graph.php: fix undefined index 'type' in $plugin_json[$type] | Pim van den Berg | 2014-05-24 | 1 | -0/+3 | |
| | | | | | | | When type wasn't set in the plugin json, a "PHP Notice: Undefined index" would pop up. Just default to 'default' when type isn't set. Closes #76 #77 | |||||
* | plugin: fix typo in temperature type | Nicolas Iooss | 2014-05-21 | 2 | -2/+2 | |
| | ||||||
* | detail.php: fix canvas graphs | Pim van den Berg | 2014-05-19 | 1 | -1/+1 | |
| | | | | | | Include graph.php instead of non-existing plugin/$plugin.php. Closes #75 | |||||
* | Add base on all df plugins | Poil | 2014-05-18 | 3 | -3/+6 | |
| | ||||||
* | Add base option (1GB=1024Mo) | Poil | 2014-05-18 | 3 | -1/+8 | |
| | ||||||
* | plugin/libvirt: show (v)CPU time in milliseconds | Pim van den Berg | 2014-05-17 | 1 | -4/+6 | |
| | ||||||
* | plugin/uptime: fix legend format (.1lf -> %.1lf) | Pim van den Berg | 2014-05-14 | 1 | -1/+1 | |
| | | | | Closes: #72 | |||||
* | inc/html.inc.php: fix canvas graphs | Pim van den Berg | 2014-05-14 | 1 | -1/+1 | |
| | | | | Include graph.php instead of non-existing plugin/$plugin.php. | |||||
* | plugin/memory: add cache | Pim van den Berg | 2014-05-14 | 1 | -0/+4 | |
| | | | | Closes: https://github.com/pommi/CGP/issues/71 | |||||
* | plugin/processes: add wait, idle | Pim van den Berg | 2014-05-12 | 1 | -0/+8 | |
| | | | | Closes: https://github.com/pommi/CGP/issues/69 | |||||
* | graph.php: use JSON plugins instead of including PHP plugin files | Pim van den Berg | 2014-05-12 | 96 | -2792/+2248 | |
| | | | | | | | | | | | | A couple of big changes here. A lot of logic moved to graph.php. The PHP plugin files have been rewritten to JSON. In these JSON files *everything* is optional. Also *NOT* having a JSON plugin file won't block you from having a graph. The JSON will just make the graphs prettier (by having a title, y-axis title, legend, colors, etc..). The Collectd types.db file is parsed and used to determine RRD content. When things are not defined in the JSON it will fallback to a default. | |||||
* | type/base: set default title to "Plugin Type (PluginInstance) (Category)" | Pim van den Berg | 2014-05-12 | 1 | -1/+13 | |
| | ||||||
* | type/base: always use rainbow_colors and overwrite them afterwards | Pim van den Berg | 2014-05-03 | 1 | -3/+4 | |
| | | | | | | Since the previous commit [type/base: show tinstances not defined in $this->order in graph] all type instances that are not defined in the plugin, are colored black. This way you always have nice colors. | |||||
* | type/base: show tinstances not defined in $this->order in graph | Pim van den Berg | 2014-05-03 | 1 | -6/+5 | |
| | | | | | | Previously if $this->order was defined in a graph, only type instances that were defined in $this->order showed up in the graph. Now it merges $this->order and the type instances. | |||||
* | rename ds_names and dsname to legend | Pim van den Berg | 2014-05-03 | 45 | -150/+150 | |
| | | | | This had nothing to do with an RRD data source. | |||||
* | type/base: set default values for rrd_title and rrd_format | Pim van den Berg | 2014-05-03 | 1 | -1/+2 | |
| | ||||||
* | move collectd_flush function to base class | Pim van den Berg | 2014-05-03 | 53 | -169/+75 | |
| | ||||||
* | type: move generic functions to base class | Pim van den Berg | 2014-05-03 | 5 | -300/+306 | |
| | ||||||
* | type/Default: don't depend on external function GET | Pim van den Berg | 2014-05-03 | 51 | -80/+78 | |
| | ||||||
* | inc: mv graphs_from_plugin, build_url functions to html.inc.php | Pim van den Berg | 2014-05-03 | 2 | -70/+68 | |
| | | | | They generate html. | |||||
* | inc/collectd: consistently return false instead of an empty array or false | Pim van den Berg | 2014-05-03 | 3 | -21/+19 | |
| | | | | | | | | | This means we have to check the return value of these functions for example before doing a foreach. We can't just do a foreach and assume the return value of a function is an array, while it can be false and results in a PHP warning. Closes: https://github.com/pommi/CGP/pull/68 | |||||
* | plugin/memory: add osx/bsd ds_names to order, set color of active to ff00ff | Pim van den Berg | 2014-05-01 | 1 | -2/+2 | |
| | | | | Closes: https://github.com/pommi/CGP/issues/67 | |||||
* | plugin/memory: add support for osx/bsd | Pim van den Berg | 2014-04-28 | 1 | -0/+8 | |
| | | | | Closes: https://github.com/pommi/CGP/issues/67 | |||||
* | plugin/df: fix support for collectd 4 | Pim van den Berg | 2014-04-15 | 1 | -0/+1 | |
| | | | | | | | Support for collectd 4 was broken since commit: v0.4.1-52-g0c50eff [Plugin/df: Add support for inode graphs] Closes: https://github.com/pommi/CGP/issues/64 | |||||
* | overview: disable showmem by default, add percent sign | Pim van den Berg | 2014-04-15 | 2 | -26/+26 | |
| | | | | And change all spaces to tabs. | |||||
* | overview: show used memory percentage | Bogdan Rădulescu | 2014-04-14 | 2 | -2/+27 | |
| | ||||||
* | Merge pull request #61 from young-druid/patch-1 | Pim van den Berg | 2014-04-09 | 1 | -1/+1 | |
|\ | | | | | fix: return operator prevents us from seeing a graph | |||||
| * | fix: return operator prevents us from seeing a graph | young-druid | 2014-04-08 | 1 | -1/+1 | |
|/ | ||||||
* | overview: only calculate cores when config option showload is enabled | Pim van den Berg | 2014-04-06 | 1 | -2/+2 | |
| | | | | Closes: https://github.com/pommi/CGP/issues/60 | |||||
* | add SVG graph support | Pim van den Berg | 2014-03-23 | 3 | -7/+25 | |
| | ||||||
* | plugin/aggregation: cpu: allow 4 digits | Thomas Harold | 2014-03-23 | 1 | -1/+1 | |
| |