admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-09 05:26:50 +09:00
Code Issues Packages Projects Releases Wiki Activity
4,838 Commits 76 Branches 85 Tags
0fef67d0a6476d78df4cbdff94271d048d7c10b0
Commit Graph
49 Commits
Author SHA1 Message Date
Micke2k 0fef67d0a6 Attempt at fixing step and heartbeat during import 
Step and heartbeat was always set to default when importing profiles with a newly created datasource_profile(example 1 minute polling profile).

Now step and heartbeat is read from the profile.

New installations and upgrades do not have a datasource_profile. $profile_id is returned as an array in that case. Not to happy about the fix for that, but it works.

Tested import with default profile, 1 minute polling profile as well as new installation import of Disk IO. Works fine.
 2016-04-09 21:58:10 +04:00
cigamit 8f11b3c112 more removal of rra_id 2016-03-19 09:52:26 -05:00
Micke2k 07826332db Undefined variable: import_custom_rra_settings in import.php 
Changed to import_as_new
 2016-03-19 17:24:31 +04:00
cigamit 39bbb23ac5 implement data source profiles 
this commit will cause your 1.0 environment to break.  to fix, please
run the script 'profile_migrate.php'.  this commit includes a major new
feature to allow your Cacti system to have multiple polling intervals
and for you to create identical graphs using multiple polling intervals
in a sane way.  this is an initial commit, one that has been tested.
however, there will be subsequent commits.  however, after migration,
this should be considered stable.
 2016-03-14 06:59:54 -05:00
cigamit 2e236dcbdf big commit back porting features 
back port the following features from main:

1) vdef support
2) new graph items
3) new graph options

this covers all the high points available in rrdtool today.

also change the following:

1) allow forms to include spacers
2) reorganize graph template form with spacers
3) many help wording back ports from main

for those testing, if you are going to start using this version, you
will have to implement the changes in the upgrade script or reinstall.
also note that this change may break new aggregates.
 2016-03-09 20:43:52 -06:00
Linegod f31c7b6835 first spellcheck pass 2016-02-07 23:12:03 -06:00
Micke2k d188f1631d Change Copyright year 2015 -> 2016 2016-01-29 21:46:02 +04:00
Jimmy Conner 5bde3da972 1) Update Copyright Years Correct a few minor CY Issues 
2) Allow Locking/UnLocking of Graphs
3) ToolTips
4) Correct Minor Issues with Login/Out/Permission associated with Theme JS
5) Upgrade jQuery which has Fixes for Major issue in Safari 7/8.1

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7662 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2015-01-04 01:52:50 +00:00
Jeff Pasnak 6e9f636abf #0002492 - Standardize mysql syntax - final pass 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7621 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-28 21:09:38 +00:00
Jimmy Conner ac6d6929cc Remove some unnecessary ending PHP closing tags 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7571 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-17 03:02:03 +00:00
Tony Roman 65be30ffe0 Update copyright to 2014 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7437 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-03-30 19:54:50 +00:00
Tony Roman ce40281901 Update copyright to 2013 for 0.8.8 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7386 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2013-07-21 23:00:42 +00:00
Tony Roman a257958a0b Update copyright to 2012 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@7016 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2012-02-27 07:04:37 +00:00
Reinhard Scheck 7c94ebaabb -bug#0002093: unit exponent value of 0 not imported with graph template 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6913 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-11-13 17:59:16 +00:00
Reinhard Scheck 920066fd19 0002094: CDEF: "another cdef" references not included in template export 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6909 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-11-13 15:25:52 +00:00
Tony Roman 9acba795fe Update copyright to 2011 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6233 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-01-27 03:44:05 +00:00
Reinhard Scheck 14fc72a382 -bug#0001926: Importing templates "using defaults for this installation" associates all rra's defined 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6230 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-01-20 20:33:17 +00:00
Reinhard Scheck 9d2a164909 -bug#0001568: Cacti currently gives a lot of warnings of deprecated functions on PHP 5.3 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6200 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-01-06 21:03:25 +00:00
Larry Adams c5403f3844 QA: Update copyrights 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5806 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-04-28 03:48:09 +00:00
Larry Adams d10567cb9f -QA: remove invalid htmlspecialchars from code. Not appropriate for this function. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5189 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2009-08-19 00:01:03 +00:00
Larry Adams aad34a72f5 -bug#0001522: Special(?) charakters break parsing of template data. 
-bug#0001452: Missing "<" and ">" in "Collection Methods=>Data Input Methods=>"Input String", When Import Template 
-bug#0001125: XML parse error on template import with degree symbol 
-bug#0001366: Exported data templates do not import the special characters properly 

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5188 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2009-08-18 23:38:30 +00:00
Tony Roman 26d1957d62 Update copyright to 2009 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4931 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2009-02-11 22:53:50 +00:00
Jimmy Conner 9bc2210a43 Parse error: syntax error, unexpected ')' 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4757 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2008-10-10 03:50:22 +00:00
Tony Roman ff81c2633e XSS implementation was flawed, it has been fixed. Please use clean_html_output where you want to remove possible XSS issues. This is only to be used on HTML output. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4743 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2008-09-27 21:27:24 +00:00
Larry Adams 22f9e12ddb Update Copyright Notice for 2008. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4434 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2008-01-29 00:40:43 +00:00
Ian Berry 24b576c0ac add ability to ignore rra settings when importing template xml and use this behavior as the default. i simplified this feature a good bit from our discussion so feedback is welcome 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4101 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-09-01 17:12:52 +00:00
Ian Berry 8df06bd41d -bug#0000982: Remove invalid references to the output_string column in the data_input table 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@4047 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-08-01 00:20:19 +00:00
Tony Roman e625781ec6 Typos suck and I'm glad I have a script to update copyrights 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3898 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-03-04 20:17:57 +00:00
Tony Roman 8ff975973a Proper date range needed in copyright 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3896 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-03-04 20:11:14 +00:00
Tony Roman e116f23ff7 Copyright update for php files 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3894 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2007-03-04 19:30:21 +00:00
Larry Adams 1ccf9934ee -bug#0000885: When Exporting/Importing Data Input Methods, Space between arguments is removed 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3843 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2006-12-31 20:35:50 +00:00
Ian Berry 587cd4872a add fix for the auto increment bug that stems from newer versions of adodb (bug#0000729) 
update fix from r3571 so it matches the official patch on the website


git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3603 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2006-04-19 04:02:33 +00:00
Larry Adams f22fa2ee35 -bug#0000528: Allow template_import.php to return without error when xml file is invalid in PHP 4.4 and above. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3405 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2005-12-03 23:59:38 +00:00
Larry Adams 2bbb6120f7 changes for mysql 5.x support 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3215 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2005-10-09 21:20:19 +00:00
Ian Berry eddabc6f60 add proper handling for special xml characters (bug#0000506) 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@3108 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2005-08-17 01:44:20 +00:00
Larry Adams 80a0c920d0 Changes for 0.8.6c 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/branches/BRANCH_0_8_6/cacti@2266 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-11-19 03:48:24 +00:00
Ian Berry d3cebc97b2 use include_once 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1837 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-07-24 00:52:43 +00:00
Ian Berry 859dd6cf52 removed manual data input method mappings for data queries 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1569 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-06-08 18:36:05 +00:00
Ian Berry 6feb665da6 fix 0.8.4 XML import issue with 'Unit Exponent Value' 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1555 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-05-17 06:36:02 +00:00
Ian Berry 55325c967e overlooked calling generate_data_input_field_sequences() when importing a data input method 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1527 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-03-12 05:51:41 +00:00
Ian Berry ae264da708 add xml_character_encode() and xml_character_decode() to work around php's buggy handling of html entities 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1501 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-02-01 20:37:42 +00:00
Ian Berry fbf3e9e4eb missing reset() calls causing certain things not to import at all 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1489 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-01-28 05:34:44 +00:00
Ian Berry 9014054837 updated the copyright to 2004 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1469 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-01-19 06:05:14 +00:00
Ian Berry 9e5b253e92 export and import user-defined colors correctly 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1467 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2004-01-19 05:53:40 +00:00
Ian Berry b6c0df468f fix problem importing cdef items (thanks rolf) 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1409 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-12-12 03:47:12 +00:00
Ian Berry 1f1b2b5ba3 php 4.3.x complains about pass-by-reference variables 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1386 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-11-17 04:08:06 +00:00
Ian Berry ca0732a59c fix potential 'not an array' errors when importing xml files 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1360 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-11-09 20:01:33 +00:00
Ian Berry 1f38b5788b add host template and round robin archive XML import/export support 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1306 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-10-30 06:33:38 +00:00
Ian Berry 127fa39d7d finished up most of the xml import code; fixed a few export bugs 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/trunk/cacti@1283 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2003-10-24 02:14:39 +00:00