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

Introduce new get_cacti_version function to reduce database calls on pages

Browse Source
This commit is contained in:
cigamit committed 2017-05-14 12:29:30 -05:00
1 parent 7985ca2e81
commit 1a14cbb440
46 files changed
+121 -130
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cli/add_data_query.php
+1 -1
View File
@@ -212,7 +212,7 @@ if (sizeof($parms)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Add Data Query Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/add_device.php
+1 -1
View File
@@ -450,7 +450,7 @@ if (sizeof($parms)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Add Device Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/add_graph_template.php
+1 -1
View File
@@ -173,7 +173,7 @@ if (sizeof($parms)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Add Graph Template Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/add_graphs.php
+1 -1
View File
@@ -682,7 +682,7 @@ if (sizeof($parms)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Add Graphs Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/add_perms.php
+1 -1
View File
@@ -243,7 +243,7 @@ if (sizeof($parms) == 0) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Add Permissions Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/add_tree.php
+1 -1
View File
@@ -311,7 +311,7 @@ if (sizeof($parms)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Add Tree Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/analyze_database.php
+1 -1
View File
@@ -89,7 +89,7 @@ if (sizeof($tables)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Analyze Database Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/convert_innodb.php
+1 -1
View File
@@ -120,7 +120,7 @@ if (sizeof($tables)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Database Conversion Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/copy_user.php
+1 -1
View File
@@ -78,7 +78,7 @@ print "User copied...\n";
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Copy User Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/data_template_associate_rra.php
+1 -1
View File
@@ -143,7 +143,7 @@ function associate($data_template_id, $data_rra, $debug, $quiet) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Data Template Associate RRD Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/host_update_template.php
+1 -1
View File
@@ -159,7 +159,7 @@ if (db_fetch_cell("SELECT id FROM host_template WHERE id=$template") > 0) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Retemplate Host Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/import_package.php
+1 -1
View File
@@ -143,7 +143,7 @@ if (sizeof($parms)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Import Template Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/import_template.php
+1 -1
View File
@@ -141,7 +141,7 @@ if (sizeof($parms)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Import Template Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/poller_data_sources_reapply_names.php
+1 -1
View File
@@ -151,7 +151,7 @@ foreach ($data_source_list as $data_source) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Reapply Data Source Names Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/poller_graphs_reapply_names.php
+1 -1
View File
@@ -147,7 +147,7 @@ foreach ($graph_list as $graph) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Reapply graph Names Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/poller_output_empty.php
+1 -1
View File
@@ -89,7 +89,7 @@ rrd_close($rrdtool_pipe);
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Process Poller Output Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/poller_reindex_hosts.php
+1 -1
View File
@@ -139,7 +139,7 @@ if (sizeof($data_queries)) {
/* display_help - displays the usage of the function */
function display_help () {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Reindex Host Utility, Version $version, " . COPYRIGHT_YEARS . "\n\n";
echo "usage: poller_reindex_hosts.php --id=[host_id|all] [--qid=[ID|all]] [--host-descr=[description]]\n";
echo " [-d] [-h] [--help] [-v] [--version]\n\n";
cli/rebuild_poller_cache.php
+1 -1
View File
@@ -128,7 +128,7 @@ ini_set('max_execution_time', $max_execution);
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Rebuild Poller Cache Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/removespikes.php
+1 -1
View File
@@ -1295,7 +1295,7 @@ function calculateStandardDeviation($items) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Spike Remover Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/reorder_data_query.php
+1 -1
View File
@@ -152,7 +152,7 @@ if (sizeof($data_queries)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Reorder Data Query Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/repair_database.php
+1 -1
View File
@@ -207,7 +207,7 @@ if ($total_rows > 0 && !$force) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Database Repair Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/repair_templates.php
+1 -1
View File
@@ -137,7 +137,7 @@ if (sizeof($damaged_template_ids)) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Database Template Repair Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/sqltable_to_php.php
+1 -1
View File
@@ -194,7 +194,7 @@ function sql_clean($text) {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Add Device Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/structure_rra_paths.php
+1 -1
View File
@@ -223,7 +223,7 @@ function disable_poller() {
/* display_version - displays version information */
function display_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
$version = get_cacti_version();
echo "Cacti Structured Paths Creation Utility, Version $version, " . COPYRIGHT_YEARS . "\n";
}
cli/upgrade_database.php
+65 -85
View File
@@ -23,15 +23,15 @@
+-------------------------------------------------------------------------+
*/
// do NOT run this script through a web browser
/* do NOT run this script through a web browser */
if (!isset($_SERVER['argv'][0]) || isset($_SERVER['REQUEST_METHOD']) || isset($_SERVER['REMOTE_ADDR'])) {
die('<br><strong>This script is only meant to run at the command line.</strong>');
}
// We are not talking to the browser
/* We are not talking to the browser */
$no_http_headers = true;
// allow the upgrade script to run for as long as it needs to
/* allow the upgrade script to run for as long as it needs to */
ini_set('max_execution_time', '0');
include(dirname(__FILE__) . '/../include/global.php');
@@ -39,16 +39,16 @@ include_once($config['base_path'] . '/lib/data_query.php');
include_once($config['base_path'] . '/lib/utility.php');
include_once($config['base_path'] . '/install/functions.php');
// process calling arguments
/* process calling arguments */
$parms = $_SERVER['argv'];
array_shift($parms);
global $debug, $cli_upgrade, $session;
$debug = FALSE;
$cli_upgrade = TRUE;
$session = array();
$force_version = NULL;
$debug = true;
$cli_upgrade = true;
$session = array();
$forcever = '';
if (sizeof($parms)) {
foreach($parms as $parameter) {
@@ -60,141 +60,121 @@ if (sizeof($parms)) {
}
switch ($arg) {
case '--force_version':
$force_version = $value;
case '--forcever':
$forcever = $value;
break;
case '-d':
case '--debug':
$debug = TRUE;
break;
case '--database_version':
display_database_version();
exit;
case '--version':
case '-V':
case '-v':
display_version();
case '--help':
case '-H':
case '-h':
display_help();
exit;
default:
print "ERROR: Invalid Parameter " . $parameter . PHP_EOL . PHP_EOL;
echo "ERROR: Invalid Parameter " . $parameter . PHP_EOL . PHP_EOL;
display_help();
exit;
}
}
}
// we need to rerun the upgrade, force the current version
if (empty($force_version)) {
$old_cacti_version = db_fetch_cell('SELECT cacti FROM version');
/* we need to rerun the upgrade, force the current version */
if ($forcever == '') {
$old_cacti_version = get_cacti_version();
} else {
$old_cacti_version = $force_version;
$old_cacti_version = $forcever;
}
$old_cacti_version = trim($old_cacti_version);
// do a version check
/* try to find current (old) version in the array */
$old_version_index = (array_key_exists($old_cacti_version, $cacti_version_codes) ? $old_cacti_version : '');
/* do a version check */
if ($old_cacti_version == CACTI_VERSION) {
print "Your Cacti is already up to date." . PHP_EOL;
echo "Your Cacti is already up to date." . PHP_EOL;
exit;
}
if (version_compare($old_cacti_version, '0.7', '<')) {
print 'You are attempting to install cacti ' . CACTI_VERSION . ' onto a 0.6.x database.' . PHP_EOL . "To continue, you must create a new database, import 'cacti.sql' into it," . PHP_EOL . "and\tupdate 'include/config.php' to point to the new database." . PHP_EOL;
} elseif ($old_cacti_version < 0.7) {
echo 'You are attempting to install cacti ' . CACTI_VERSION . ' onto a 0.6.x database.' . PHP_EOL . "To continue, you must create a new database, import 'cacti.sql' into it," . PHP_EOL . "and\tupdate 'include/config.php' to point to the new database." . PHP_EOL;
exit;
}
if (empty($old_cacti_version)) {
print "You have created a new database, but have not yet imported the 'cacti.sql' file." . PHP_EOL;
} elseif (empty($old_cacti_version)) {
echo "You have created a new database, but have not yet imported the 'cacti.sql' file." . PHP_EOL;
exit;
}
if ($old_cacti_version == 'new_install') {
print "You can not upgrade a new installation" . PHP_EOL;
exit;
}
if (! array_key_exists($old_cacti_version, $cacti_version_codes)) {
print "Invalid Cacti version $old_cacti_version, cannot upgrade to " . CACTI_VERSION . PHP_EOL;
} elseif ($old_version_index == '') {
echo "Invalid Cacti version $old_cacti_version, cannot upgrade to " . CACTI_VERSION . PHP_EOL;
exit;
}
// loop through versions from old version to the current, performing updates for each version in the chain
foreach ($cacti_version_codes as $cacti_upgrade_version => $hash_code) {
foreach ($cacti_version_codes as $cacti_version => $hash_code) {
// skip versions old than the database version
if (version_compare($old_cacti_version, $cacti_upgrade_version, '>=')) {
if (version_compare($old_cacti_version, $cacti_version, '>=')) {
continue;
}
// construct version upgrade include path
$upgrade_file = dirname(__FILE__) . '/../install/upgrades/' . str_replace('.', '_', $cacti_upgrade_version) . '.php';
$upgrade_function = 'upgrade_to_' . str_replace('.', '_', $cacti_upgrade_version);
$upgrade_file = dirname(__FILE__) . '/../install/upgrades/' . str_replace('.', '_', $cacti_version) . '.php';
$upgrade_function = 'upgrade_to_' . str_replace('.', '_', $cacti_version);
// check for upgrade version file, then include, check for function and execute
print 'Upgrading to ' . $cacti_upgrade_version . ' ';
echo 'Upgrading to ' . $cacti_version . ' ';
if (file_exists($upgrade_file)) {
include($upgrade_file);
print PHP_EOL;
echo PHP_EOL;
if (function_exists($upgrade_function)) {
call_user_func($upgrade_function);
print_upgrade_results($cacti_upgrade_version);
db_install_errors($cacti_version);
} else {
print 'Error: upgrade function (' . $upgrade_function . ') not found' . PHP_EOL;;
echo 'Error: upgrade function (' . $upgrade_function . ') not found' . PHP_EOL;;
}
} else {
print "no actions" . PHP_EOL;
echo "no actions" . PHP_EOL;
}
if (CACTI_VERSION == $cacti_upgrade_version) {
if (CACTI_VERSION == $cacti_version) {
break;
}
}
db_execute("UPDATE version SET cacti = '" . CACTI_VERSION . "'");
/*
* Print upgrade results for requested version
*/
function print_upgrade_results($cacti_version) {
global $session, $debug;
function db_install_errors($cacti_version) {
global $session;
// if sessions are working for cli, use it
if (isset($_SESSION)) {
$session = $_SESSION;
}
if (array_key_exists($cacti_version, $session['cacti_db_install_cache'])) {
foreach ($session['cacti_db_install_cache'][$cacti_version] as $action) {
if ($action['status'] == 0) {
print " DB Error: " . $action['sql'] . PHP_EOL;
} elseif ($debug) {
print " DB Success: " . $action['sql'] . PHP_EOL;
if (sizeof($session)) {
foreach ($session as $sc) {
if (isset($sc[$cacti_version])) {
foreach ($sc[$cacti_version] as $value => $sql) {
if ($value == 0) {
echo " DB Error: " . $sql . PHP_EOL;
}
}
}
}
}
}
/*
* Display database version information
*/
function display_database_version() {
$version = db_fetch_cell('SELECT cacti FROM version');
print 'Database Version: ' . trim($version) . PHP_EOL;
/* display_version - displays version information */
function display_version() {
$version = get_cacti_version();
echo "Cacti Database Upgrade Utility, Version $version, " . COPYRIGHT_YEARS . PHP_EOL;
}
/*
* Display cli help
*/
/* display_help - displays the usage of the function */
function display_help () {
print 'Cacti Database Upgrade Utility, Version ' . CACTI_VERSION . ', ' . COPYRIGHT_YEARS . PHP_EOL;
print PHP_EOL;
print "usage: upgrade_database.php [--debug] [--force_version=VERSION] [--database_version]" . PHP_EOL;
print PHP_EOL;
print "--force_version - Force the starting version, say " . CACTI_VERSION . PHP_EOL;
print "--database_version - Display database version and exit" . PHP_EOL;
print "--debug - Display verbose output during execution" . PHP_EOL;
print PHP_EOL;
print PHP_EOL;
print "Command line Cacti database upgrade tool. You must execute" . PHP_EOL;
print "this command as a super user, or someone who can write a PHP session file." . PHP_EOL;
print "Typically, this user account will be apache, www-run, or root." . PHP_EOL;
print PHP_EOL;
print "If you are running a beta or alpha version of Cacti and need to rerun" . PHP_EOL;
print "the upgrade script, simply set the force_version to the previous version." . PHP_EOL;
print PHP_EOL;
display_version();
echo PHP_EOL . "usage: upgrade_database.php [--debug] [--forcever=VERSION]" . PHP_EOL . PHP_EOL;
echo "A command line version of the Cacti database upgrade tool. You must execute" . PHP_EOL;
echo "this command as a super user, or someone who can write a PHP session file." . PHP_EOL;
echo "Typically, this user account will be apache, www-run, or root." . PHP_EOL . PHP_EOL;
echo "If you are running a beta or alpha version of Cacti and need to rerun" . PHP_EOL;
echo "the upgrade script, simply set the forcever to the previous release." . PHP_EOL . PHP_EOL;
echo "--forcever - Force the starting version, say " . CACTI_VERSION . PHP_EOL;
echo "--debug - Display verbose output during execution" . PHP_EOL . PHP_EOL;
}