admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-03 18:47:54 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolve two reviewer comments

Browse Source
This commit is contained in:
TheWitness committed 2026-11-01 19:20:10 -05:00
1 parent 7d8292759d
commit ba2ab827c1
2 files changed
+73 -86
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

locales/po/cacti.pot
+69 -85
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cacti 1.2.32\n"
"Report-Msgid-Bugs-To: developers@cacti.net\n"
"POT-Creation-Date: 2026-10-11 16:07-0700\n"
"POT-Creation-Date: 2026-11-01 19:17-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2632,35 +2632,14 @@ msgstr ""
msgid "Data Source debug received an invalid Data Source ID."
msgstr ""
#: data_debug.php
#: data_debug.php data_sources.php
msgid "All RRDfile repairs succeeded."
msgstr ""
#: data_debug.php
#: data_debug.php data_sources.php
msgid "One or more RRDfile repairs failed. See Cacti log for errors."
msgstr ""
#: data_sources.php
msgid "The RRDfile could not be read, so no repairs were performed."
msgstr ""
#: data_sources.php
msgid "No RRDfile repairs were necessary."
msgstr ""
#: data_sources.php
msgid "The RRDfile is not writable by the web server. Run the suggested commands from the command line instead."
msgstr ""
#: data_sources.php
#, php-format
msgid "RRDtool Tune Info [ %s ]"
msgstr ""
#: data_sources.php
msgid "Run Fix from Command Line"
msgstr ""
#: data_debug.php
msgid "Automatic Data Source debug being rerun after repair."
msgstr ""
@@ -2896,7 +2875,7 @@ msgstr ""
msgid "For attribute '%s', issue found '%s'"
msgstr ""
#: data_debug.php
#: data_debug.php data_sources.php
msgid "Apply Suggested Fixes"
msgstr ""
@@ -3675,6 +3654,18 @@ msgstr ""
msgid "No Input Fields for the Selected Data Input Source"
msgstr ""
#: data_sources.php
msgid "The RRDfile could not be read, so no repairs were performed."
msgstr ""
#: data_sources.php
msgid "No RRDfile repairs were necessary."
msgstr ""
#: data_sources.php
msgid "The RRDfile is not writable by the web server. Run the suggested commands from the command line instead."
msgstr ""
#: data_sources.php
#, php-format
msgid "Data Template Selection [edit: %s]"
@@ -3768,6 +3759,15 @@ msgstr ""
msgid "Data Source Debug"
msgstr ""
#: data_sources.php
#, php-format
msgid "RRDtool Tune Info [ %s ]"
msgstr ""
#: data_sources.php
msgid "Run Fix from Command Line"
msgstr ""
#: data_sources.php
msgid "RRDtool Tune Info"
msgstr ""
@@ -4100,7 +4100,7 @@ msgstr[1] ""
msgid "2 Years (%s Average)"
msgstr ""
#: graph.php lib/html.php
#: graph.php
msgid "Graph Details, Zooming and Debugging Utilities"
msgstr ""
@@ -4108,23 +4108,11 @@ msgstr ""
msgid "CSV Export"
msgstr ""
#: lib/html.php
msgid "Time View"
msgstr ""
#: lib/html.php
msgid "Realtime"
msgstr ""
#: lib/html.php
msgid "Kill Spikes"
msgstr ""
#: graph.php lib/html.php
msgid "Edit Graph Template"
msgstr ""
#: graph.php lib/html.php
#: graph.php
msgid "Click to view just this Graph in Real-time"
msgstr ""
@@ -11129,14 +11117,6 @@ msgstr ""
msgid "If the boost poller exceeds this runtime, a warning will be placed in the cacti log,"
msgstr ""
#: include/global_settings.php
msgid "Enable direct population of poller_output_boost table"
msgstr ""
#: include/global_settings.php
msgid "Enables direct insert of records into poller output boost with results in a 25% time reduction in each poll cycle."
msgstr ""
#: include/global_settings.php
msgid "Boost Debug Log"
msgstr ""
@@ -13095,11 +13075,11 @@ msgid "Data Query:"
msgstr ""
#: lib/html.php
msgid "CSV Export of Graph Data"
msgid "Graph Actions"
msgstr ""
#: lib/html.php
msgid "Time Graph View"
msgid "Time View"
msgstr ""
#: lib/html.php
@@ -13107,7 +13087,11 @@ msgid "Edit Device"
msgstr ""
#: lib/html.php
msgid "Kill Spikes in Graphs"
msgid "Realtime"
msgstr ""
#: lib/html.php
msgid "Kill Spikes"
msgstr ""
#: lib/html.php lib/installer.php
@@ -13214,6 +13198,10 @@ msgstr ""
msgid "No file selected"
msgstr ""
#: lib/html.php
msgid "Time Graph View"
msgstr ""
#: lib/html.php
msgid "SpikeKill Results"
msgstr ""
@@ -15612,6 +15600,11 @@ msgstr ""
msgid "The Plugin in the directory '%s' does not include an version function '%s()'. This function must exist for the plugin to be installed."
msgstr ""
#: lib/plugins.php
#, php-format
msgid "Plugin %s installation failed. Its hooks are disabled. Review the plugin setup and Cacti log before enabling it."
msgstr ""
#: lib/plugins.php
#, php-format
msgid "The Plugin in the directory '%s' does not include an install function '%s()'. This function must exist for the plugin to be installed."
@@ -15711,6 +15704,26 @@ msgstr ""
msgid "ERROR: RRD file does not exist: %s"
msgstr ""
#: lib/rrd.php
#, php-format
msgid "The Graph requires %d Data Sources but the RRDfile only includes %d. The missing Data Sources will be added."
msgstr ""
#: lib/rrd.php
#, php-format
msgid "The Graph requires %d Data Sources but the RRDfile includes %d. The extra Data Sources will be removed."
msgstr ""
#: lib/rrd.php
#, php-format
msgid "Data Source '%s' is required by the Graph but is missing from the RRDfile and will be added"
msgstr ""
#: lib/rrd.php
#, php-format
msgid "Data Source '%s' is included in the RRDfile but is not required by the Graph and will be removed"
msgstr ""
#: lib/rrd.php
#, php-format
msgid "The required RRDfile step size is '%s' but observed step is '%s'"
@@ -15731,11 +15744,6 @@ msgstr ""
msgid "RRD minimum for Data Source '%s' should be '%s'"
msgstr ""
#: lib/rrd.php
#, php-format
msgid "DS '%s' missing in Cacti definition"
msgstr ""
#: lib/rrd.php
#, php-format
msgid "Cacti RRA '%s' has same CF/steps (%s, %s) as '%s'"
@@ -15819,6 +15827,11 @@ msgstr ""
msgid "CDP Unknown Data points (0)"
msgstr ""
#: lib/rrd.php
#, php-format
msgid "rename %s to %s"
msgstr ""
#: lib/rrd.php
msgid "Errors Found"
msgstr ""
@@ -15827,11 +15840,6 @@ msgstr ""
msgid "Optional Tuning Recommendations"
msgstr ""
#: lib/rrd.php
#, php-format
msgid "rename %s to %s"
msgstr ""
#: lib/rrd.php
msgid "ERROR: Invalid RRDfile path"
msgstr ""
@@ -19318,6 +19326,7 @@ msgid "Max Total Memory Possible"
msgstr ""
#: utilities.php
#, php-format
msgid "Reduce MySQL/MariaDB Memory to less than 80% of System Memory. Preserve additional Cache Memory for RRDfiles if the Database is on the same system as the RRDfiles. See Core and Client Totals below for explanation of calculation method."
msgstr ""
@@ -20026,28 +20035,3 @@ msgstr ""
#: vdef.php
msgid "No VDEFs"
msgstr ""
#: lib/html.php
msgid "Graph Actions"
msgstr ""
#: lib/plugins.php:835
#, php-format
msgid "Plugin %s installation failed. Its hooks are disabled. Review the plugin setup and Cacti log before enabling it."
msgstr ""
#: links.php
msgid "Links"
msgstr ""
#: pollers.php
msgid "Collectors"
msgstr ""
#: rrdcleaner.php
msgid "RRDfiles"
msgstr ""
#: user_domains.php
msgid "Domains"
msgstr ""
poller.php
+4 -1
View File
@@ -190,9 +190,12 @@ if ($dbhostname == '' || $dbhostname == 'localhost' || $dbhostname == '127.0.0.1
$total_pollers = db_fetch_cell('SELECT COUNT(*) FROM poller');
if ($total_pollers > 1) {
set_config_option('boost_rrd_update_system_enable', 'on');
set_config_option('boost_redirect', 'on');
}
// Boost redirect must always be on. Making this change
// unconfitionally until after 1.2.32 is released
set_config_option('boost_redirect', 'on');
// check to see if the poller is disabled
poller_enabled_check($poller_id);