Skip to content

Commit 8c221f4

Browse files
committed
More formatting updates
1 parent 76b5e23 commit 8c221f4

20 files changed

+191
-120
lines changed

Data-Input-Methods.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Data Input Methods
22

3-
Data Input Methods allow Cacti to retrieve data to insert into RRDfiles based upon a mapping controlled by **Data Templates** and their corresponding **Data Sources**. These resulting **Data Templates** and **Data Sources** can then be used to create **Graph Templates** and **Graphs**. Cacti includes a number of build in **Data Input Methods** for **SNMP** data and for **Script**, **Script Server** and **SNMP Data Queries**.
3+
Data Input Methods allow Cacti to retrieve data to insert into RRD files based upon a mapping controlled by **Data Templates** and their corresponding **Data Sources**. These resulting **Data Templates** and **Data Sources** can then be used to create **Graph Templates** and **Graphs**. Cacti includes a number of build in **Data Input Methods** for **SNMP** data and for **Script**, **Script Server** and **SNMP Data Queries**.
44

55
Outside of the built in **Data Input Methods**, the Cacti Administrator can create virtually any **Data Input Method** based upon a **Scripts**, or a PHP **Script Server** script. The **Script** based **Data Input Method** allows Cacti to virtually collect data from anywhere, though the built in **SNMP** and **Script Server** methods provide the greatest scalability in Cacti. Both **Data Queries**, and PHP **Script Server** topics will be covered in later sections of the documentation.
66

@@ -26,7 +26,7 @@ When you are finished filling in all necessary fields, click the Create button t
2626

2727
The `Input Fields` box is used to define any fields that require information from the user or from various data within the Cacti Database such as the hostname, ip address, host id, etc. Any input fields referenced to in the input string must be defined here.
2828

29-
The `Output Fields` box is used to define each field that you expect back from the script and will be eventually stored in both the database and RRDfiles.
29+
The `Output Fields` box is used to define each field that you expect back from the script and will be eventually stored in both the database and RRD files.
3030

3131
*All **Data Input Methods** must have at least one output field defined*, but may have more than one depending on the type.
3232

@@ -116,7 +116,7 @@ close(PROCESS);
116116
$ping =~ m/(.*time=)(.*) (ms|usec)/;
117117

118118
if ($2 == "") {
119-
print "U"; # avoid cacti errors, but do not fake RRDtool stats
119+
print "U"; # avoid cacti errors, but do not fake RRDTool stats
120120
}elsif ($3 eq "usec") {
121121
print $2/1000; # re-calculate in units of "ms"
122122
}else{
@@ -188,7 +188,7 @@ Notice, that not only an entry was made under **Graph Template Items**, but unde
188188
189189
![Graph Template Items 4](images/r-gt5.png)
190190
191-
Notice, that the **Data Source** is filled in automagically. Select LEGEND as **Graph Item Type** (it is not really a **Graph Item Type** in RRDtool-speak, but a nice time-saver), and click **Create** to see:
191+
Notice, that the **Data Source** is filled in automagically. Select LEGEND as **Graph Item Type** (it is not really a **Graph Item Type** in RRDTool-speak, but a nice time-saver), and click **Create** to see:
192192
193193
![Graph Template Items 5](images/r-gt6.png)
194194
@@ -374,7 +374,7 @@ Finally Save and be proud!
374374
375375
### The Data Template
376376
377-
The previous step explained how to call the script that retrieves the data. Now it's time to tell Cacti, how to store them in RRDfiles. You will need a single **Data Template** only, even if two different output fields will be stored. RRDfiles are able to store more than one output fields; RRDtools name for those is **Data Source**. So we will create
377+
The previous step explained how to call the script that retrieves the data. Now it's time to tell Cacti, how to store them in RRD files. You will need a single **Data Template** only, even if two different output fields will be stored. RRD files are able to store more than one output fields; RRDTool's name for those is **Data Source**. So we will create
378378
379379
1. one single **Data Template** representing one RRDfile
380380
2. two output fields/data sources

Debugging.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ for all existing RRD files belonging to that Data Template.
169169
At this step, it is wise to check `step` and `heartbeat` of the RRD file as
170170
well. For standard 300 seconds polling intervals (step=300), it is wise to set
171171
`minimal_heartbeat` to 600 seconds. If a single update is missing and the next
172-
one occurs in less than 600 seconds from the last one, rrdtool will interpolate
172+
one occurs in less than 600 seconds from the last one, RRDTool will interpolate
173173
the missing update. Thus, gaps are "filled" automatically by interpolation. Be
174174
aware of the fact, that this is no "real" data! Again, this must be done in the
175-
Data Template itself and by using rrdtool tune for all existing RRD files of
175+
Data Template itself and by using `rrdtool tune` for all existing RRD files of
176176
this type.
177177

178-
## Check rrdtool graph statement
178+
## Check `rrdtool graph` statement
179179

180180
Last resort would be to check, that the correct data sources are used. Go to
181181
`Graph Management` and select your Graph. Enable DEBUG Mode to find the whole
@@ -228,7 +228,7 @@ shell> vi /etc/cron.d/cacti
228228
```
229229

230230
This will produce a file `/var/local/log/poller.log`, which includes some
231-
additional informations from each poller's run, such as rrdtool errors. It
231+
additional informations from each poller's run, such as RRDTool errors. It
232232
occupies only some few bytes and will be overwritten each time.
233233

234234
If you're using the crontab of user "cactiuser" instead, this will look like

Graph-Overview.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ it is possible to manually create graphs through this screen, new users should
66
follow the instructions provided in the next chapter for creating new graphs in
77
Cacti.
88

9-
For users that are familiar with [RRDTool](http://www.rrdtool.org/), you will
9+
For users that are familiar with [RRDTool](http://www.RRDTool.org/), you will
1010
immediately recognize that a graph in Cacti is closely modeled after RRDTool's
1111
graphs. This makes sense since Cacti provides a user friendly interface to
1212
RRDTool without requiring users to understand how RRDTool works. With this in

Graph-Templates.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Graph Templates
22

3-
**Graph Templates** are Cacti objects that allows you to define how RRDtool is to render a Cacti **Graph**. Most RRDtool options are supported including CDEF's and VDEF's, Left and Right Axis, Ticks and Dashes, multiple Auto Scaling, Grid, and Legend Options.
3+
**Graph Templates** are Cacti objects that allows you to define how RRDTool is to render a Cacti **Graph**. Most RRDTool options are supported including CDEF's and VDEF's, Left and Right Axis, Ticks and Dashes, multiple Auto Scaling, Grid, and Legend Options.
44

55
The purpose of **Graph Templates** is to simplify the **Automation** process by pre-defining the layout of **Graphs** for various metrics that are to be monitored in Cacti. When used in Conjunction with Cacti's **Graph Rules**, you can automatically create just about any **Data Query** based **Graph** during Cacti's **Network Discovery** process.
66

@@ -28,7 +28,7 @@ When Editing a **Graph Template**, there will be several sections that will requ
2828
- *Axis Options* - Defines if there should be a right Axis and how it should be formatted
2929
- *Legend Options* - Defines how the Legends should be formatted
3030

31-
Each of these sections are displayed below for reference. For more information on how to use these options, please visit the [RRDtool Website](http://rrdtool.org).
31+
Each of these sections are displayed below for reference. For more information on how to use these options, please visit the [RRDTool Website](http://RRDTool.org).
3232

3333
The *Graph Items* make up what is draw within the canvas of the Graph. There are several *Graph Item* types including:
3434

@@ -56,7 +56,7 @@ Under the *Common Options*, you will create a template for the *Graph Name*, ass
5656

5757
![Graph Name and Common Options](images/graph-templates-edit2.png)
5858

59-
The *Scaling Options* allow the Administrator to apply either *Rigid* or *Auto Scaling* settings to the resulting *Graph*. These options are fairly self explanatory. However, you can always view the RRDtool Documentation online for more information.
59+
The *Scaling Options* allow the Administrator to apply either *Rigid* or *Auto Scaling* settings to the resulting *Graph*. These options are fairly self explanatory. However, you can always view the RRDTool Documentation online for more information.
6060

6161
![Scaling Options](images/graph-templates-edit3.png)
6262

@@ -68,7 +68,7 @@ The *Axis Options* allow you to define a *Right Axis* and optional *Formatters*.
6868

6969
![Axis Options](images/graph-templates-edit5.png)
7070

71-
The *Legend* options allow you to specify how the *Legend* should be placed on the resulting **Graph** modern RRDtool has several options that were not available in Cacti prior to Cacti 1.0.
71+
The *Legend* options allow you to specify how the *Legend* should be placed on the resulting **Graph** modern RRDTool has several options that were not available in Cacti prior to Cacti 1.0.
7272

7373
![Legend Options](images/graph-templates-edit6.png)
7474

Graph-a-Single-SNMP-OID.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Name | Description
2020
(Graph) Title | The title that is to be used for the new graph. It is generally a good idea to keep `|host_description|` in the title, as to make the graph easier to identify later.
2121
(Graph) Vertical Label | The text that will be printed along the y-axis of the graph. It is generally used to describe units, such as 'bytes' or 'percent'.
2222
(Graph Items) Legend Color | The color that will be used to represent the data on the graph.
23-
(Graph Items) Opacity/Alpha Channel | This optionally provides an opacity (not available with rrdtool-1.0.x) for a colored item.
23+
(Graph Items) Opacity/Alpha Channel | This optionally provides an opacity (not available with RRDTool-1.0.x) for a colored item.
2424
(Graph Items) Legend Text | The text that will be used to describe the data on the graph legend.
2525
(Data Source) Name | The title that is to be used for the new data source. It is generally a good idea to keep |host_description| in the title, as to make the data source easier to identify later.
2626
(Data Source) Maximum Value [snmp_oid] | The maximum value that will be accepted from the OID. Make sure you choose a value that is reasonable for the data you are trying to graph because anything larger than the maximum will be ignored. If you are graphing a percentage, you should use '100' as the value should never exceed this.

How-to-Graph-a-Custom-Collection-Script.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ called.
6767

6868
- Friendly Name: `Random Number`
6969

70-
- Update RRD File: ___Checked___
70+
- Update RRD file: ___Checked___
7171

7272
- Click **Create**
7373

Install-Under-CentOS_LAMP.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ files holding your certificate (`.crt`) and private key (`.key`).
6767
# Uncomment these if you use mod_security.
6868
# allow POST of application/x-www-form-urlencoded during install
6969
#SecRuleRemoveById 960010
70-
# permit the specification of the rrdtool paths during install
70+
# permit the specification of the RRDTool paths during install
7171
#SecRuleRemoveById 900011
7272
</Directory>
7373

@@ -250,13 +250,13 @@ PHP and various packages are all required by Cacti for successful operation
250250
date.timezone = Pacific/Auckland
251251
```
252252

253-
#### RRDtool
253+
#### RRDTool
254254

255255
RRDTool is required to store the data retrieved from devices in `.rra` files to
256256
produce the graphs which are shown within Cacti
257257

258258
```console
259-
yum install -y rrdtool
259+
yum install -y RRDTool
260260
```
261261

262262
#### SNMP

Install-Under-CentOS_LEMP.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ Note: **php-fpm** is only required if your Web Server is Nginx
328328
systemctl restart php-fpm
329329
```
330330

331-
### RRDtool
331+
### RRDTool
332332

333333
RRDTool is required to store the data retrieved from devices in `.rra` files to
334334
produce the graphs which are shown within Cacti

Installing-Under-Windows.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Cacti yourself, please follow the instructions below.
2727

2828
7. (Optional) Cygwin - Download and execute `setup.exe` from the Cygwin website.
2929
Keep the `setup.exe` file for later use. You will need Cygwin and its
30-
development packages for building RRDtool and spine.
30+
development packages for building RRDTool and spine.
3131

3232
8. (Optional) Net-SNMP - Install to the `c:net-snmp` directory. If you choose to
3333
use `c:\Program Files\net-snmp` you will have to use 8.3 filenames to
@@ -121,7 +121,7 @@ The following changes will be required regardless of your selected Webserver.
121121
net start w3svc
122122
```
123123

124-
## Cygwin Installation Steps for spine and RRDtool
124+
## Cygwin Installation Steps for spine and RRDTool
125125

126126
1. Installing a single instance of Cygwin, and using it for all applications
127127
that require it is recommended so you do not have different versions of the
@@ -178,7 +178,7 @@ The following changes will be required regardless of your selected Webserver.
178178
is updated from time to time, so it's recommended that you update it
179179
periodically.
180180

181-
## RRDtool Download and Installation Instructions
181+
## RRDTool Download and Installation Instructions
182182

183183
1. TBD
184184

@@ -340,7 +340,7 @@ The following changes will be required regardless of your selected Webserver.
340340
```
341341

342342
After this has ran once, you should have `cacti.log` in `/cacti/log/` and
343-
RRDfiles in `/cacti/rra/`.
343+
RRD files in `/cacti/rra/`.
344344

345345
7. You are going to need to schedule a task while logged on as an Administrator.
346346
This task is required to you can run `poller.php` every 5 minutes. Make sure

Plugin-Development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ For a simple plugin example, please review the gexport plugin.
8989

9090
Several JavaScript based HTML5 Charting packages have been included in Cacti in
9191
an effort to assist plugin developers who wish to use graphing API's in their
92-
plugins other than RRDtool.
92+
plugins other than RRDTool.
9393

9494
- [C3](http://c3js.org/)
9595
- [D3](https://d3js.org/)

Plugin-Hook-API-Ref.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ poller.php | 1.0.0 |
712712

713713
## poller\_output
714714

715-
This hook was designed specifically for the boost plug-in. However, it has found new life in many plugins making them much faster now. What this hook allows you to do is intercept the contents of the `poller_output` table before the data is deleted. This allows for things like threshold checking and other interesting actions such as checking for up/down events and the like. Previously, plugins were reliant on using things like RRDtool fetch to perform these actions. Now they can leverage the pollers output directly.
715+
This hook was designed specifically for the boost plug-in. However, it has found new life in many plugins making them much faster now. What this hook allows you to do is intercept the contents of the `poller_output` table before the data is deleted. This allows for things like threshold checking and other interesting actions such as checking for up/down events and the like. Previously, plugins were reliant on using things like `rrdtool fetch` to perform these actions. Now they can leverage the pollers output directly.
716716

717717
file | introduced | retired
718718
--- | :--- | :---
@@ -753,7 +753,7 @@ lib/export.php | 1.2.0-beta1 |
753753

754754
## rrd\_graph\_graph\_options
755755

756-
This hook allows you to specify additional options or change parameters regarding graph image rendering. Some of the parameters will be passed to rrdtool.
756+
This hook allows you to specify additional options or change parameters regarding graph image rendering. Some of the parameters will be passed to RRDTool.
757757

758758
file | introduced | retired
759759
--- | :--- | :---

Principles-of-Operation.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ to scripts, script queries and more.
2222
## Data Storage
2323

2424
There are lots of different approaches for this task. Some may use an (SQL)
25-
database, others flat files. Cacti uses [RRDTool](http://www.rrdtool.org/) to
25+
database, others flat files. Cacti uses [RRDTool](http://www.RRDTool.org/) to
2626
store data.
2727

2828
RRD is the acronym for Round Robin Database. RRD is a system to store and
@@ -31,15 +31,15 @@ server load average). It stores the data in a very compact way that will not
3131
expand over time, and it can create beautiful graphs. This keeps storage
3232
requirements at bay.
3333

34-
Likewise, rrdtool will perform some specific tasks. It performs consolidation
35-
to combine raw data (a primary data point in rrdtool lingo) to consolidated
34+
Likewise, RRDTool will perform some specific tasks. It performs consolidation
35+
to combine raw data (a primary data point in RRDTool lingo) to consolidated
3636
data (a consolidated data point). This way, historical data is compressed to
37-
save space. rrdtool knows different consolidation functions: AVERAGE, MAXIMUM,
37+
save space. RRDTool knows different consolidation functions: AVERAGE, MAXIMUM,
3838
MINIMUM and LAST.
3939

4040
## Data Presentation
4141

42-
One of the most appreciated features of [RRDTool](http://www.rrdtool.org/) is
42+
One of the most appreciated features of [RRDTool](http://www.RRDTool.org/) is
4343
the built-in graphing function. This comes in useful when combining this with
4444
some commonly used webserver. Such, it is possible to access the graphs from
4545
merely any browser on any platform.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![Cacti](images/logo.png)
44

5-
Cacti is designed to be a complete graphing solution based on the RRDtool's
5+
Cacti is designed to be a complete graphing solution based on the RRDTool's
66
framework. Its goal is to make a network administrator's job easier by taking
77
care of all the necessary details necessary to create meaningful graphs.
88

@@ -28,7 +28,7 @@ Please see the official Cacti website for information, support, and updates.
2828

2929
## Thanks
3030

31-
A very special thanks to Tobi Oetiker, the creator of RRDtool and the very
31+
A very special thanks to Tobi Oetiker, the creator of RRDTool and the very
3232
popular MRTG. The users of Cacti Especially anyone who has taken the time to
3333
create an issue report, or otherwise help fix a Cacti related problems. Also
3434
to anyone who has contributed to supporting Cacti.

RRDTool-Specific-Features.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ description of each CDEF item type.
3838

3939
Type | Description
4040
--- | ---
41-
Function | You can choose a CDEF function to use as the item. [The RRDTool graph manual](http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/doc/rrdgraph.en.html) describes the purpose of each CDEF function.
41+
Function | You can choose a CDEF function to use as the item. [The RRDTool's graph manual](http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/doc/rrdgraph.en.html) describes the purpose of each CDEF function.
4242
Operator | Just your standard math operators, including modulo (%).
4343
Special Data Source | A special data source is basically a flag to tell Cacti to do some special processing when it encounters this CDEF item. The "Current Graph Item Data Source" type basically inserts the name of the data source that is referenced by the graph item that references to this CDEF. Both of the "All Data Sources" types insert a summation of all data sources used on a graph.
4444
Another CDEF | You can recursively use another CDEF within this CDEF.
@@ -541,13 +541,13 @@ AREA:cdefc#FF0000FF:"% Used"
541541
performs the percentage calculation.
542542
543543
You may of course add `GPRINT` legends as usual. If you do this for the "% Used"
544-
entry only, you will get surprising results, if your rrd file holds either
544+
entry only, you will get surprising results, if your RRD file holds either
545545
`MAXIMUM`, `LAST` and/or `MINIMUM` consolidation function(s). This is left as
546546
an exercise to you :)
547547
548548
This set of CDEFs is used to colorize the background of a graph with different
549549
colors for day, night and weekends. The CDEFs are created as usual, we will
550-
show the CDEF definition only. Examples are taken from rrdtool-users mailing
550+
show the CDEF definition only. Examples are taken from RRDTool-users mailing
551551
list courtesy Erik de Mare. Here are the definitions
552552
553553
#### Background for Daytime

0 commit comments

Comments
 (0)