| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Closes #92
|
|
|
|
|
|
|
|
|
| |
index.php expects that collectd_hosts() always return an array for
array_diff. Since an empty array evaluates to FALSE anyway, do not
change the type and just return the empty array.
In base.php, if no files are returned, the loop is never called and
three variables are not initialized. Do it now.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
They generate html.
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
The snmp plugin is saving if_octets this way:
<host>/snmp/if_octets-<port>.rrd
Where the interfaces plugin is saving if_octets with this structure:
<host>/interface-<port>/if_octets.rrd
|
| |
|
|
|
|
| |
Use less variables, less code.
|
| |
|
|
|
|
| |
Reported-by: Reza (http://pommi.nethuis.nl/collectd-graph-panel-v0-3/#comment-26990)
|
|
|
|
|
| |
For example when a non existing plugin is defined in $CONFIG['overview'] it
causes a lot of php warnings/notices.
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
|
| |
When running CGP in the root, the header didn't link to the overview page
because the href was empty.
Reported-by: Nikoli <Nikoli@lavabit.com>
|
| |
|
| |
|
|
|
|
|
| |
These errors got concatenated in front of the image, which resulted in an
invalid image.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously graphs were created by collecting and merging all PIs, Ts and TIs
separately. This went wrong when a part of a plugin had a PI and another part
had not (processes plugin). It also went wrong when a P-PI combination had
different Ts and TIs (bind plugin).
This is solved by using grouped and deduplicated plugindata.
--
P = plugin, PI = plugin instance, T = type, TI = type instance
|
|
|
|
| |
A couple of preg_replaces are replaced by one simple but effective preg_match.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Planned for collectd version 5.0 is to move the type instance of plugins
df and interface to the plugin instance (see source). From version 5.0 the
default is to group data from a type instance OR data source in one graph.
In case of version 4 there are only 2 plugins to exclude from this: df and
interface.
Source: http://collectd.org/wiki/index.php/Plans_for_5.0
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
| |
These configuration options have been added:
- width
- heigth
- detail-width
- detail-heigth
|
|
Collectd Graph Panel is a frontend for Collectd written in PHP.
The goal of CGP is to provide an easy-to-use frontend for Collectd,
starting with page that shows an overview of all the hosts you are
managing with Collectd.
In this initial import there is support for the plugins that are default
enabled in Collectd. The supported plugins are located in the plugin
directory.
|