| Commit message (Collapse) | Author | Files | Lines |
|
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.
|
|
This had nothing to do with an RRD data source.
|
|
|
|
|
|
|
|
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.
|
|
Signed-off-by: Pim van den Berg <pim@nethuis.nl>
|
|
|
|
|
|
A constructor is added to the Type_Default class. The constructor will
parse GET values (such as host, plugin, pinstance, type, tinstance,
seconds), create an array of all needed rrd files to generate a graph and
substract identifiers from these rrd files.
Because of the constructor (and related functions) it is not needed to
define an array of tinstances to be grouped and shown in one graph. Also
$obj->args don't have to be defined per plugin. This will result in
smaller plugin files.
The type classes are based on the fact that a plugin has multiple type
instances OR multiple rrd data sources. This is called the source and is
retrieved by rrd_get_sources in each rrd_gen_graph function. Also
variables in function rrd_gen_graph have been renamed to better ones.
|
|
'on $host' doesn't have to be added manually to rrd_title anymore.
|
|
Via the UnixSock plugin of Collectd it is possible to send commands to the
Collectd daemon. One of the commands is the FLUSH command, which you can
use to let the daemon write cached data to the rrd files.
CGP uses the FLUSH command before generating a graph and before showing
the load information on the main page. In this case the information shown
via CGP is always up-to-date. Also when you have configured the RRDTool
plugin of Collectd with a CacheTimeout setting.
This commit includes code based on functions collectd_identifier and
collectd_flush from php-collection by Bruno Prémont.
|
|
The relative path to an rrd file can be generated based on host, plugin,
plugin instance, type and type instance. In this case path_format is not
needed anymore.
This commit includes code based on the collectd_identifier function from
php-collection by Bruno Prémont.
|
|
- Don't depend on includes from files that are included.
- Don't use webdir with includes/requires (also because webdir couldn't
be available in some cases).
- Use common.inc.php instead of config.php in all plugins to have all
configuration settings available.
|