Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(install): Remove obsolete rrdtool configuration and sources #7195

Merged
merged 8 commits into from
Apr 5, 2019
Merged

fix(install): Remove obsolete rrdtool configuration and sources #7195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86f593a
fix(install): set actual RRDtool version
lpinsivy Feb 15, 2019
d360f52
fix(update): use new system to remove unused RRDtool entries
lpinsivy Apr 2, 2019
242572b
fix(install): Remove unused PHP sources
lpinsivy Feb 15, 2019
95eafa9
fix(UI): Remove unused RRDTool options in form
lpinsivy Feb 15, 2019
9388700
Update www/include/Administration/parameters/rrdtool/form.php
sc979 Feb 18, 2019
b7a9b01
enh(doc): improve documentation
lpinsivy Mar 6, 2019
93a0e0e
fix(update): remove unsued file
lpinsivy Apr 2, 2019
ef447ff
Merge branch 'master' into remove-obsolete-rrdtool-configuration
lpinsivy Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions doc/en/administration_guide/parameters.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,26 +174,26 @@ Then restart Apache :

service httpd restart


*******
RRDTool
*******

This part can be used to configure the RRDTool graphs generation engine and the sizes of the typefaces used for their presentation.

#. Go into the menu: **Administration > Parameters > RRDTool**
This part can be used to configure the RRDTool graphs generation engine.
Go into the **Administration > Parameters > RRDTool** menu.

.. image :: /images/guide_exploitation/errdtool.png
:align: center

* **Directory + RRDTOOL Binary** field defines the path to the RRDTool executable
* The fields belonging to the categories **Title Properties**, **Unit Properties**, **Axis Properties**, **Legend Properties** and **Watermark Properties** are used to define the typeface and character size for the property selected
* **RRDTool Version** allows to know the version of RRDTool
* **Enable RRDCached** field serves to enable the RRDcached process (only works with the Centreon Broker)
* **TCP Port** field defines the port on which RRDcached listens (don’t enable the TCP connection)
* **TCP Port** field defines the port on which RRDcached listens.
* **UNIX Socket path** field defines the path to the Unix socket

.. warning::
Don’t enable RRDCacheD unless your monitoring platform encounters too many disk accesses concerning the writing of data in RRD files.
Don’t enable RRDCacheD unless your monitoring platform encounters too many
disk accesses concerning the writing of data in RRD files.
Select only one option: TCP or Unix socket.

*****
Debug
Expand Down
Binary file modified doc/en/images/guide_exploitation/errdtool.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 8 additions & 10 deletions doc/fr/administration_guide/parameters.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,28 +181,26 @@ Puis redémarrez le serveur Apache :

service httpd restart


*******
RRDTool
*******

Cette partie permet de configurer le moteur de génération des graphiques RRDTool ainsi que les tailles des polices utilisées pour la présentation de ces derniers.

#. Rendez-vous dans le menu **Administration > Paramétres**
#. Dans le menu de gauche, cliquez sur **RRDTool**
#. Cliquez sur **RRDTool**
Cette partie permet de configurer le moteur de génération des graphiques RRDTool.
Rendez-vous dans le menu **Administration > Paramétres > RRDTool**

.. image :: /images/guide_exploitation/errdtool.png
:align: center

* Le champ **Chemin complet de l'exécutable RRDTOOL** définit le chemin vers l'exécutable RRDTool
* Les champs appartenant aux catégories **Propriétés du titre**, **Propriétés de l'unité**, **Propriétés des axes**, **Propriétés de la légende**, **Propriété du filigrane** permettent de définir la police ainsi que la taille de la police pour la propriété sélectionnée
* Le champ **Activer RRDCached** permet d'activer le processus RRDcached (Ne fonctionne qu'avec le broker Centreon Broker)
* Le champ **Port TCP** définit le port sur lequel écoute RRDcached (ne pas activer la connexion TCP)
* Le champ **Version de RRDTool** permet de connaître la version de RRDTool
* Le champ **Activer RRDCached** permet d'activer le processus RRDcached
* Le champ **Port TCP** définit le port sur lequel écoute RRDcached
* Le champ **Chemin d'accès au socket Unix** définit le chemin vers le socket Unix

.. warning::
N'activez RRDCacheD que si votre plate-forme de supervision rencontre de trop nombreux accès disques concernant l'écriture des données dans les fichiers RRD.
N'activez RRDCacheD que si votre plate-forme de supervision rencontre de trop
nombreux accès disques concernant l'écriture des données dans les fichiers RRD.
Ne choississez qu'une option (TCP ou socket Unix).

********
Debogage
Expand Down
Binary file modified doc/fr/images/guide_exploitation/errdtool.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 0 additions & 127 deletions www/include/Administration/corePerformance/processCommands.php
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions www/include/Administration/parameters/DB-Func.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,66 +701,6 @@ function updateRRDToolConfigData($gopt_id = null)
isset($ret["rrdtool_version"]) && $ret["rrdtool_version"] != null
? htmlentities($ret["rrdtool_version"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_title_font",
isset($ret["rrdtool_title_font"]) && $ret["rrdtool_title_font"] != null
? htmlentities($ret["rrdtool_title_font"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_title_fontsize",
isset($ret["rrdtool_title_fontsize"]) && $ret["rrdtool_title_fontsize"] != null
? htmlentities($ret["rrdtool_title_fontsize"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_unit_font",
isset($ret["rrdtool_unit_font"]) && $ret["rrdtool_unit_font"] != null
? htmlentities($ret["rrdtool_unit_font"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_unit_fontsize",
isset($ret["rrdtool_unit_fontsize"]) && $ret["rrdtool_unit_fontsize"] != null
? htmlentities($ret["rrdtool_unit_fontsize"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_axis_font",
isset($ret["rrdtool_axis_font"]) && $ret["rrdtool_axis_font"] != null
? htmlentities($ret["rrdtool_axis_font"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_axis_fontsize",
isset($ret["rrdtool_axis_fontsize"]) && $ret["rrdtool_axis_fontsize"] != null
? htmlentities($ret["rrdtool_axis_fontsize"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_watermark_font",
isset($ret["rrdtool_watermark_font"]) && $ret["rrdtool_watermark_font"] != null
? htmlentities($ret["rrdtool_watermark_font"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_watermark_fontsize",
isset($ret["rrdtool_watermark_fontsize"]) && $ret["rrdtool_watermark_fontsize"] != null
? htmlentities($ret["rrdtool_watermark_fontsize"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_legend_font",
isset($ret["rrdtool_legend_font"]) && $ret["rrdtool_legend_font"] != null
? htmlentities($ret["rrdtool_legend_font"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdtool_legend_fontsize",
isset($ret["rrdtool_legend_fontsize"]) && $ret["rrdtool_legend_fontsize"] != null
? htmlentities($ret["rrdtool_legend_fontsize"], ENT_QUOTES, "UTF-8") : "NULL"
);
updateOption(
$pearDB,
"rrdcached_enable",
Expand Down
82 changes: 0 additions & 82 deletions www/include/Administration/parameters/rrdtool/form.ihtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,84 +23,6 @@
<td class="FormRowValue">{$form.rrdtool_version.html}</td>
</tr>

<tr class="list_lvl_1">
<td class="ListColLvl1_name" colspan="2">
<h4>{$form.header.title_title}</h4>
</td>
</tr>
<tr class="list_two">
<td class="FormRowField"><img class="helpTooltip" name="tip_title_font">{$form.rrdtool_title_font.label}
</td>
<td class="FormRowValue">{$form.rrdtool_title_font.html}</td>
</tr>
<tr class="list_one">
<td class="FormRowField"><img class="helpTooltip" name="tip_title_font_size">{$form.rrdtool_title_fontsize.label}
</td>
<td class="FormRowValue">{$form.rrdtool_title_fontsize.html}&nbsp;px</td>
</tr>

<tr class="list_lvl_1">
<td class="ListColLvl1_name" colspan="2">
<h4>{$form.header.unit_title}</h4>
</td>
</tr>
<tr class="list_two">
<td class="FormRowField"><img class="helpTooltip" name="tip_unit_font">{$form.rrdtool_unit_font.label}</td>
<td class="FormRowValue">{$form.rrdtool_unit_font.html}</td>
</tr>
<tr class="list_one">
<td class="FormRowField"><img class="helpTooltip" name="tip_unit_font_size">{$form.rrdtool_unit_fontsize.label}
</td>
<td class="FormRowValue">{$form.rrdtool_unit_fontsize.html}&nbsp;px</td>
</tr>

<tr class="list_lvl_1">
<td class="ListColLvl1_name" colspan="2">
<h4>{$form.header.axis_title}</h4>
</td>
</tr>
<tr class="list_two">
<td class="FormRowField"><img class="helpTooltip" name="tip_axis_font">{$form.rrdtool_axis_font.label}</td>
<td class="FormRowValue">{$form.rrdtool_axis_font.html}</td>
</tr>
<tr class="list_one">
<td class="FormRowField"><img class="helpTooltip" name="tip_axis_font_size">{$form.rrdtool_axis_fontsize.label}
</td>
<td class="FormRowValue">{$form.rrdtool_axis_fontsize.html}&nbsp;px</td>
</tr>

<tr class="list_lvl_1">
<td class="ListColLvl1_name" colspan="2">
<h4>{$form.header.legend_title}</h4>
</td>
</tr>
<tr class="list_two">
<td class="FormRowField"><img class="helpTooltip" name="tip_legend_font">{$form.rrdtool_legend_font.label}
</td>
<td class="FormRowValue">{$form.rrdtool_legend_font.html}</td>
</tr>
<tr class="list_one">
<td class="FormRowField"><img class="helpTooltip" name="tip_legend_font_size">{$form.rrdtool_legend_fontsize.label}
</td>
<td class="FormRowValue">{$form.rrdtool_legend_fontsize.html}&nbsp;px</td>
</tr>

<tr class="list_lvl_1">
<td class="ListColLvl1_name" colspan="2">
<h4>{$form.header.watermark_title}</h4>
</td>
</tr>
<tr class="list_two">
<td class="FormRowField"><img class="helpTooltip" name="tip_watermark_font">{$form.rrdtool_watermark_font.label}
</td>
<td class="FormRowValue">{$form.rrdtool_watermark_font.html}</td>
</tr>
<tr class="list_one">
<td class="FormRowField"><img class="helpTooltip" name="tip_watermark_font_size">{$form.rrdtool_watermark_fontsize.label}
</td>
<td class="FormRowValue">{$form.rrdtool_watermark_fontsize.html}&nbsp;px</td>
</tr>

<tr class="list_lvl_1">
<td class="ListColLvl1_name" colspan="2">
<h4>{$form.header.rrdcached_title}</h4>
Expand All @@ -121,10 +43,6 @@
</td>
<td class="FormRowValue">{$form.rrdcached_unix_path.html}</td>
</tr>

<tr class="list_lvl_1">
<td class="ListColLvl1_name" colspan="2">{$form.required._note}</td>
</tr>
</table>
{if !$valid}
<div id="validForm" class="oreonbutton">
Expand Down
Loading