Commit Graph
245 Commits
Author SHA1 Message Date
Reinhard Scheck 33b5b83730 -bug#0002156: CDEF strings are not escaped before passed to rrdtool command
better solution to CDEF escaping only; so less side-effects
fixed missing escaping for ds_names as well

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@7053 860744bd-22fc-0310-8c96-e9fe5004b5ca
2012-03-10 10:19:34 +00:00
Reinhard Scheck 4edac1f14f 0002156: CDEF strings are not escaped before passed to rrdtool command
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@7038 860744bd-22fc-0310-8c96-e9fe5004b5ca
2012-03-09 15:30:39 +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
Tony Roman 2d039dd7db Merge PIA into 0.8.7 branch
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@7006 860744bd-22fc-0310-8c96-e9fe5004b5ca
2012-02-27 01:14:45 +00:00
Tony Roman d399d3e920 fix issue with title variable replacement failing when no host is associated with graph
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6939 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-11-22 15:35:45 +00:00
Larry Adams eddb5b5130 -bug#0001963: "total in" and "total out" are always 0
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6912 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-11-13 16:33:36 +00:00
Larry Adams 0d3d839ff9 -bug#0002066: Graph without host id Notice: Undefined variable: host_id
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6848 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-10-09 01:34:05 +00:00
Larry Adams c910c005ca Properly support ifHighSpeed patch
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6837 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-10-09 00:57:05 +00:00
Reinhard Scheck 7faaa04c57 in case e.g. ifSpeed resolves to 0, rrdcreate breaks
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6783 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-09-17 15:00:00 +00:00
Reinhard Scheck 0a15d6b5ee fix handling of |query_*| in rrd substitutions and fix using "U" as an rrd_maximum
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6778 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-09-13 18:26:51 +00:00
Tony Roman 8a3d9de064 Fixed issues with Cacti rrdtool fetch function failing to work correctly when NaN values are present
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6363 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-04-26 02:30:08 +00:00
Tony Roman e85f26a9b0 Update rrd lib to correctly support default arguments.
We do not need to pass rrdtool pipe as a reference because all
resources(popen) are already references.

This still needs to be tested on php 4.x

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6331 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-02-25 02:16:56 +00:00
Tony Roman 171202e94e Revert change in revision 5828 that changed the required arguments of functions
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6319 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-02-21 01:30:54 +00:00
Larry Adams be74895e64 -feature#0001952: Ability to use input field of a script in graph title
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6315 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-02-20 19:39:19 +00:00
Reinhard Scheck 27d167d72f fix several initialization issues
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6302 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-02-11 20:00:00 +00:00
Reinhard Scheck 8d51dcd274 -feature#0001667: Get values of |host_*| variables in graph elements from data source
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6300 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-02-10 20:33:05 +00:00
Reinhard Scheck 74902a2356 0001626: Cacti does not pass currency symbols ($) used in labels/gprint strings to rrdtool during graph generation.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6284 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-02-04 20:29:16 +00:00
Larry Adams 9df0bbb3be -bug#0001867: rrdtool_funcion_fetch() wrong regex with some locales
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6250 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-28 21:42:42 +00:00
Larry Adams 93af782dfe -bug#0001847: graph export is broken
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6248 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-28 21:19:26 +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 9c44040884 0001768: error drawing traffic graphs
+ formatting issue

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6203 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-06 21:26:41 +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
Reinhard Scheck 6756b32541 0001768: error drawing traffic graphs
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6199 860744bd-22fc-0310-8c96-e9fe5004b5ca
2011-01-06 18:38:16 +00:00
Tony Roman 6dd39a03ee More XSS issues fixed
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6041 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-07-07 17:49:25 +00:00
Reinhard Scheck c93d793ba7 -bug#0001756: Alternate font styles don't work
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5983 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-06-07 15:47:30 +00:00
Reinhard Scheck 078a919d3c Use windows-aware escapeshellarg
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5974 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-06-03 21:01:59 +00:00
Reinhard Scheck f135bcf708 allow empty upper/lower limit even without autoscale
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5839 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-05-03 18:07:53 +00:00
Larry Adams 8a2e8b71cb QA: PHP4 compatibility. Holding back from main.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5829 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-05-02 16:54:46 +00:00
Larry Adams b9ae1dbc5e QA: Pass by reference must be explicit. Need to test this on PHP4. May end up backing out
feature: Inform user of RRDtool command that caused failure.

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5828 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-05-02 16:16:08 +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 cd7d78cae0 QA: Finishing up RRDtool segfault corrections.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5800 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-04-28 00:51:09 +00:00
Reinhard Scheck 638c065c57 prevent command injection enhanced for rrd
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5784 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-04-21 19:43:56 +00:00
Reinhard Scheck bfd7476698 correctly escape rrdtool-1.3.x++ fonts for use with rrdtool graph
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5783 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-04-21 18:43:59 +00:00
Reinhard Scheck 738a78e540 fc-list available on *nix only
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5781 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-04-21 17:07:14 +00:00
Reinhard Scheck f2c9fe99ac prevent command injection
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5778 860744bd-22fc-0310-8c96-e9fe5004b5ca
2010-04-20 20:52:32 +00:00
Reinhard Scheck d99bb97eed #bug#0001557: Quotes in Text Format graph template field breaks graph
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5392 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-11-24 21:05:57 +00:00
Reinhard Scheck 6ee1dcea56 0001492: RRDTool 1.3 series fonts
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5331 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-10-03 20:44:53 +00:00
Larry Adams 6f75dcaf2d -bug#0001476: Mark stacked columns in rrdtool_function_xport() output
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5116 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-06-25 02:36:17 +00:00
Larry Adams fd4a72e714 QA: correct spelling issue.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5096 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-06-22 15:45:00 +00:00
Larry Adams d99b9b695c -bug#0001446: Wrong dates override in CSV export
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5013 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-05-04 13:28:22 +00:00
Larry Adams 288194db46 Revert two code commit's done by accident.
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5005 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-04-25 02:30:10 +00:00
Larry Adams 076ad06372 redo redo of redo of 0001346: Strip out noisy 'No Such Instance currently exists at this OID'
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@5004 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-04-25 02:27:18 +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
Larry Adams 9b31028bdc -QA: Reverting change. There is no good way out of this. Here is the "bad" scenario. Say a user get's a jacked up RRDtool binary, its happened before, and rrdtool crashes after the first update, but all other 10k updates will work fine, you will, by virtue of this modified rrd.php be able to update those 10k RRD's, but you will be left with 10k processes hanging around until poller.php exits. Pretty ugly. We need to drop PHP 4 support!
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4925 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-02-10 02:15:22 +00:00
Larry Adams a0bf40f1a9 -QA: somehow pass by reference was dropped from rrdtool_execute
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4924 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-02-09 01:09:56 +00:00
Reinhard Scheck 91e6621b3b -bug#0001392: Problem on CDEF function ALL|SIMILAR_DATA_SOURCES_(NO)?DUPS
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4901 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-02-05 19:52:23 +00:00
Reinhard Scheck ebe865265c 0001383: syntax error in lib/rrd.php with PHP 4.4.4
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4897 860744bd-22fc-0310-8c96-e9fe5004b5ca
2009-01-31 19:22:12 +00:00
Larry Adams 81b593ae93 -QA: RRDcreate Function Should Create Structured Path Prior to Creating RRDfile
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4828 860744bd-22fc-0310-8c96-e9fe5004b5ca
2008-12-01 13:20:56 +00:00
Reinhard Scheck aa4edec0e0 -bug#0001314: Use Data Query variables as HRULE input for graph templates
Remarks: 
User requested support on GPRINT as well. This is already available.
Support on VRULE IMHO makes no sense, as a "timestamp" is required and I can't make sense of any data query variable providing a meaningful timestamp. If anybody provides me with a valid example, I will implement (it's only 3 lines of code)

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4814 860744bd-22fc-0310-8c96-e9fe5004b5ca
2008-11-19 20:40:19 +00:00
Reinhard Scheck 5fb7e87f53 -bug#0001306: Empty COMMENT + <HR> gives you a blank legend line (was: Add Blank Line to Graph via Pull down menu)
Cacti Template "95th Percentile" has a COMMENT _without_ a <HR>. So people have to be told to add that <HR>

Explanation:
rrdtool fails on empty COMMENT (COMMENT:"" gives an error)
rrdtool acts wrong on COMMENT with NL only (COMMENT:"\n" results in NOP)
so we change
  COMMENT:"\n"
to
  COMMENT:" \n"
This works!

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@4813 860744bd-22fc-0310-8c96-e9fe5004b5ca
2008-11-19 20:02:51 +00:00